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 a403467..fefde48 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 @@ -91,9 +91,11 @@ public class JDOrderListController extends BaseController if (orderRows != null) { jdOrder.setProPriceAmount(orderRows.getProPriceAmount()); jdOrder.setFinishTime(orderRows.getFinishTime()); + jdOrder.setOrderStatus(orderRows.getValidCode()); } else { jdOrder.setProPriceAmount(0.0); jdOrder.setFinishTime(null); + jdOrder.setOrderStatus(null); } } // 过滤掉完成时间为空的订单 @@ -107,8 +109,10 @@ public class JDOrderListController extends BaseController if (orderRows != null) { jdOrder.setProPriceAmount(orderRows.getProPriceAmount()); jdOrder.setFinishTime(orderRows.getFinishTime()); + jdOrder.setOrderStatus(orderRows.getValidCode()); } else { jdOrder.setProPriceAmount(0.0); + jdOrder.setOrderStatus(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 1956b1f..757d7b1 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 @@ -80,6 +80,11 @@ public class JDOrder extends BaseEntity { @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + /** 订单状态(从order_rows表查询) */ + @Transient + @Excel(name = "订单状态") + private Integer orderStatus; + /** 是否参与统计(0否 1是) */ @Excel(name = "参与统计") private Integer isCountEnabled;