From 09294be57e0e5f49264987e33cab20ec1c83db49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?=
 =?UTF-8?q?=EF=BC=89?= <leo@qi-cloud.com>
Date: Wed, 11 Jun 2025 18:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/van/business/model/jd/JDOrder.java | 1 +
 src/main/java/cn/van/business/util/JDUtil.java      | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/van/business/model/jd/JDOrder.java b/src/main/java/cn/van/business/model/jd/JDOrder.java
index 97421d8..6c3af08 100644
--- a/src/main/java/cn/van/business/model/jd/JDOrder.java
+++ b/src/main/java/cn/van/business/model/jd/JDOrder.java
@@ -24,6 +24,7 @@ public class JDOrder {
     private String orderId;         // 订单号
     private String buyer;           // 下单人
     private Date orderTime;         // 下单时间
+    private String status;
 
     @Column(updatable = false, insertable = false, columnDefinition = "DATETIME DEFAULT CURRENT_TIMESTAMP")
     private Date createTime;
diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index e47ad35..1827bc3 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -2391,7 +2391,8 @@ public class JDUtil {
                 }
                 int count = 1;
                 for (JDOrder jdOrder : jdOrders) {
-                    sb.append(count).append(",   单：").append(jdOrder.getOrderId()).append("\n")
+                    sb.append(count)
+                            .append(",   单：").append(jdOrder.getRemark()).append("\n")
                             .append("分销标记：").append(jdOrder.getDistributionMark()).append("\n")
                             .append("型号：").append(jdOrder.getModelNumber()).append("\n")
                             .append("链接：").append(jdOrder.getLink()).append("\n")
@@ -2402,7 +2403,7 @@ public class JDUtil {
                             .append("订单号：").append(jdOrder.getOrderId()).append("\n")
                             .append("下单人：").append(jdOrder.getBuyer()).append("\n")
                             .append("下单时间：").append(jdOrder.getOrderTime()).append("\n")
-                            .append("备注：").append(jdOrder.getRemark()).append("\n")
+                            .append("备注：").append(jdOrder.getStatus()).append("\n")
                             .append("━━━━━━━━━━━━\n");
                     count++;
                 }
@@ -2424,6 +2425,7 @@ public class JDUtil {
 
         // 定义正则表达式提取各个字段
         extractField(input, fields, "单：", "备注：");
+        extractField(input, fields, "备注：", "分销标记：");
         extractField(input, fields, "分销标记：", "型号：");
         extractField(input, fields, "型号：", "链接：");
         extractField(input, fields, "链接：", "下单付款：");
@@ -2446,6 +2448,7 @@ public class JDUtil {
         order.setDistributionMark(fields.getOrDefault("分销标记", null));
         order.setModelNumber(fields.getOrDefault("型号", null));
         order.setLink(fields.getOrDefault("链接", null));
+        order.setStatus(fields.getOrDefault("备注", null));
 
         try {
             order.setPaymentAmount(Double.parseDouble(fields.getOrDefault("下单付款", "0")));