From 3ec22e2a8e475e4b63f0df41fa20d6b5bc009ed8 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 28 May 2023 22:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 75cebb99..cbea3808 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
@@ -231,7 +231,7 @@ public class OrderController extends BaseController {
             orderMaster.setExpectTimeStart(DateUtils.parseDate(request.getServDate()+" "+split[0], "yyyy-MM-dd hh:mm"));
             orderMaster.setExpectTimeEnd(DateUtils.parseDate(request.getServDate()+" "+split[1], "yyyy-MM-dd hh:mm"));
         }catch (Exception e){
-            
+
         }
         orderMasterService.insertOrderMaster(orderMaster);
         Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
@@ -392,9 +392,9 @@ public class OrderController extends BaseController {
                 om2up.setOrderStatus(OrderStatus.GOING.code());
             } else {
                 // 派完单 但是有其他师傅接单
-                om2up.setHasDispatchedAll(0);
+                om2up.setHasDispatchedAll(1);
                 om2up.setAllSelfAssigned(0);
-                om2up.setOrderStatus(OrderStatus.RECEIVE.code());
+                om2up.setOrderStatus(OrderStatus.PLAIN.code());
             }
         } else {
             // 未派完单