clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-10 09:33:36 +08:00
parent 78f43c0c16
commit 687f691ff9
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1585,8 +1585,17 @@ public class OrderController extends BaseController {
orderStandard.setStandardNum(orderGoods.getGoodsNum()); orderStandard.setStandardNum(orderGoods.getGoodsNum());
standardList.add(orderStandard); standardList.add(orderStandard);
} }
boolean condition = (master.getAllSelfAssigned() == null || master.getAllSelfAssigned() == 0)
&& (master.getOrderStatus() != null
&& (master.getOrderStatus() == 0
|| master.getOrderStatus() == 1
|| master.getOrderStatus() == 2
|| master.getOrderStatus() == 3
|| master.getOrderStatus() == 4))
&& master.getWorkerId() != null;
logger.info("是否为监控单{}主单id{}", condition,master);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setIsMonitoredOrder(condition);
orderListResponse.setGoodsBrand(master.getGoodsBrand()); orderListResponse.setGoodsBrand(master.getGoodsBrand());
orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setGoodsSpecification(master.getGoodsSpecification());
orderListResponse.setOrderMasterId(master.getId()); orderListResponse.setOrderMasterId(master.getId());
@ -1657,7 +1666,6 @@ public class OrderController extends BaseController {
} }
logger.info("师傅端所有的列表信息{}主单信息{}", orderListResponse,master);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }

4
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -198,4 +198,8 @@ public class OrderListResponse {
private Long countryId; private Long countryId;
/**
* 是否为监控但
* */
private Boolean isMonitoredOrder;
} }