CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-05-21 16:27:39 +08:00
parent 8fcd7be160
commit b107eece07
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
View File

@@ -137,10 +137,12 @@ public class JDOrderListController extends BaseController
jdOrder.setProPriceAmount(orderRows.getProPriceAmount()); jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
jdOrder.setFinishTime(orderRows.getFinishTime()); jdOrder.setFinishTime(orderRows.getFinishTime());
jdOrder.setOrderStatus(orderRows.getValidCode()); jdOrder.setOrderStatus(orderRows.getValidCode());
jdOrder.setExpressStatus(orderRows.getExpressStatus());
} else { } else {
jdOrder.setProPriceAmount(0.0); jdOrder.setProPriceAmount(0.0);
jdOrder.setFinishTime(null); jdOrder.setFinishTime(null);
jdOrder.setOrderStatus(null); jdOrder.setOrderStatus(null);
jdOrder.setExpressStatus(null);
} }
} }
// 过滤掉完成时间为空的订单 // 过滤掉完成时间为空的订单
@@ -155,9 +157,11 @@ public class JDOrderListController extends BaseController
jdOrder.setProPriceAmount(orderRows.getProPriceAmount()); jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
jdOrder.setFinishTime(orderRows.getFinishTime()); jdOrder.setFinishTime(orderRows.getFinishTime());
jdOrder.setOrderStatus(orderRows.getValidCode()); jdOrder.setOrderStatus(orderRows.getValidCode());
jdOrder.setExpressStatus(orderRows.getExpressStatus());
} else { } else {
jdOrder.setProPriceAmount(0.0); jdOrder.setProPriceAmount(0.0);
jdOrder.setOrderStatus(null); jdOrder.setOrderStatus(null);
jdOrder.setExpressStatus(null);
} }
} }
} }

4
ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
View File

@@ -90,6 +90,10 @@ public class JDOrder extends BaseEntity {
@Excel(name = "订单状态") @Excel(name = "订单状态")
private Integer orderStatus; private Integer orderStatus;
/** 发货状态（从 order_rows.express_status 查询，10=待发货） */
@Transient
private Integer expressStatus;
/** 是否参与统计（0否 1是） */ /** 是否参与统计（0否 1是） */
@Excel(name = "参与统计") @Excel(name = "参与统计")
private Integer isCountEnabled; private Integer isCountEnabled;