From ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 四月 2025 17:26:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 747f7ab..9b0ffc8 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
@@ -327,8 +327,8 @@
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
order.setAcceptTime(new Date());
- // 待上门
- order.setState(Constants.ONE);
+ // 待上门 2.0 改为待预约
+ order.setState(7);
} else {
// 待派单状态
order.setState(Constants.ZERO);
@@ -480,7 +480,7 @@
// result = dispatchClient.saveRecord(changeDispatch).getData();
}else {
orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
-
+ orderClient.updateState(order.getId(), 7);
}
ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
--
Gitblit v1.7.1