From b107eece07682fbdbaba978f2170cb8aaad20131 Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Thu, 21 May 2026 16:27:39 +0800
Subject: [PATCH] 1

---
 .../ruoyi/web/controller/system/JDOrderListController.java    | 4 ++++
 .../src/main/java/com/ruoyi/jarvis/domain/JDOrder.java        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index d64d21d..3d442df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -137,10 +137,12 @@ public class JDOrderListController extends BaseController
                     jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
                     jdOrder.setFinishTime(orderRows.getFinishTime());
                     jdOrder.setOrderStatus(orderRows.getValidCode());
+                    jdOrder.setExpressStatus(orderRows.getExpressStatus());
                 } else {
                     jdOrder.setProPriceAmount(0.0);
                     jdOrder.setFinishTime(null);
                     jdOrder.setOrderStatus(null);
+                    jdOrder.setExpressStatus(null);
                 }
             }
             // 过滤掉完成时间为空的订单
@@ -155,9 +157,11 @@ public class JDOrderListController extends BaseController
                     jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
                     jdOrder.setFinishTime(orderRows.getFinishTime());
                     jdOrder.setOrderStatus(orderRows.getValidCode());
+                    jdOrder.setExpressStatus(orderRows.getExpressStatus());
                 } else {
                     jdOrder.setProPriceAmount(0.0);
                     jdOrder.setOrderStatus(null);
+                    jdOrder.setExpressStatus(null);
                 }
             }
         }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
index c37c196..766e2c5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
@@ -90,6 +90,10 @@ public class JDOrder extends BaseEntity {
     @Excel(name = "订单状态")
     private Integer orderStatus;
 
+    /** 发货状态（从 order_rows.express_status 查询，10=待发货） */
+    @Transient
+    private Integer expressStatus;
+
     /** 是否参与统计（0否 1是） */
     @Excel(name = "参与统计")
     private Integer isCountEnabled;