From 4c0eb273ea66af5c13c4646807dd4852733555fc Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Sun, 16 Apr 2023 11:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E5=AE=8C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E9=87=8C=EF=BC=8C=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=9C=AA=E6=B4=BE=E5=8D=95=E7=9A=84=E5=AD=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E4=B8=BB=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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<OrderMaster> orderMasters = orderMasterService.selectUnfinished();
         for (OrderMaster om : orderMasters) {
             try {
+                boolean allAssign = orderMasterService.isAllAssign(om.getId());
+                // 如果存在未派单的子订单 就不刷新主单状态
+                if (!allAssign) {
+                    break;
+                }
                 List<OrderDetail> ods = orderDetailService.selectByOrderMasterId(om.getId());
                 Set<Integer> statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet());
                 // 没有子单,未派单的情况不刷新主单状态
-                if(CollectionUtils.isEmpty(statusSet)){
+                if (CollectionUtils.isEmpty(statusSet)) {
                     break;
                 }
                 boolean allFinish = true;