From 4addb0c1afc6e238b97209ab194d3a4eadb273c1 Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Sun, 16 Apr 2023 11:57:48 +0800
Subject: [PATCH] =?UTF-8?q?has=5Fdispatched=5Fall=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=94=B1=E5=90=8E=E5=8F=B0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +-
 ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 f362bd60..e41a3818 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
@@ -309,7 +309,7 @@ public class OrderController extends BaseController {
         }
 
         // 判断是否全部派完
-        if (request.getIsAll() == 1) {
+        if (orderMasterService.isAllAssign(om.getId())) {
             om.setHasDispatchedAll(1);
         }
         orderMasterService.updateOrderMaster(om);
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index fd5f3e68..03d30e1b 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -26,6 +26,7 @@
         <result property="remark"            column="remark"/>
         <result property="goodsId"           column="goods_id"/>
         <result property="allSelfAssigned"           column="all_self_assigned"/>
+        <result property="hasDispatchedAll"           column="has_dispatched_all"/>
     </resultMap>
 
     <sql id="selectOrderMaster">