From 81ef7d6574713bfb7872bbc32050b46134b37afe Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 14:19:58 +0800
Subject: [PATCH] 11.6

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 9ea08fb..b94b768 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -436,13 +436,14 @@
         // 订单派单
         boolean result = true;
         if (Constants.TWO.equals(orderId.getType())) {
+            orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
             if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
                 orderClient.updateState(order.getId(), Constants.ONE);
 
                 //如果是待改派,将上门时间设置为最新的,并且更新再投原因
                 if (order.getState().equals(Constants.SIX)){
-                    dispatchClient.changeReason(order.getId(), orderReasinDto.getReason());
-                    orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+                    dispatchClient.changeReason(order.getId(), "");
                 }
 
             }

--
Gitblit v1.7.1