diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 1d05857f..8ca3c949 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -1585,8 +1585,17 @@ public class OrderController extends BaseController { orderStandard.setStandardNum(orderGoods.getGoodsNum()); 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.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setOrderMasterId(master.getId()); @@ -1657,7 +1666,6 @@ public class OrderController extends BaseController { } - logger.info("师傅端所有的列表信息{}主单信息{}", orderListResponse,master); orderListResponses.add(orderListResponse); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 73a4d346..2fe93a8b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -198,4 +198,8 @@ public class OrderListResponse { private Long countryId; + /** + * 是否为监控但 + * */ + private Boolean isMonitoredOrder; }