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:
Leo
2025-11-15 11:26:01 +08:00
parent 978da7042d
commit 6b07fa1d75
2 changed files with 9 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

@@ -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);
}
}
}

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

@@ -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;