diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 8d156f5c..4254f1c8 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -179,10 +179,15 @@ public class OrderServiceImpl implements OrderService { List orderMasters = orderMasterService.selectUnfinished(); for (OrderMaster om : orderMasters) { try { + boolean allAssign = orderMasterService.isAllAssign(om.getId()); + // 如果存在未派单的子订单 就不刷新主单状态 + if (!allAssign) { + break; + } List ods = orderDetailService.selectByOrderMasterId(om.getId()); Set statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet()); // 没有子单,未派单的情况不刷新主单状态 - if(CollectionUtils.isEmpty(statusSet)){ + if (CollectionUtils.isEmpty(statusSet)) { break; } boolean allFinish = true;