From 671ea52eb1f1ea63f0fa490ba38780ef8fea6aee Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 一月 2025 20:07:23 +0800
Subject: [PATCH] 订单编辑修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 9a81d69..1a1e5de 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
@@ -189,13 +189,13 @@
Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
+ List<MasterWorker> list = masterWorkerService.lambdaQuery()
+ .eq(MasterWorker::getIsDelete, 0).list();
if (null != data) {
for (Order record : data.getRecords()) {
// 回收服务信息
Integer serverId = record.getServerId();
- MasterWorker masterWorker = masterWorkerService.lambdaQuery()
- .eq(MasterWorker::getId, serverId)
- .eq(MasterWorker::getIsDelete, 0).one();
+ MasterWorker masterWorker = list.stream().filter(e -> e.getId().equals(serverId)).findFirst().orElse(null);
if (null != masterWorker) {
record.setServerName(masterWorker.getRealName());
record.setServerPhone(masterWorker.getPhone());
@@ -377,6 +377,13 @@
.eq(Site::getIsDelete, 0).one();
if (null != site) {
order.setSiteName(site.getSiteName());
+ }
+
+ Order orderData = orderClient.detail(order.getOrderId()).getData();
+
+ if(orderData.getState()==0 && (!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){
+ // 修改sys_change_dispatch 为已改派
+ dispatchClient.changeReason(order.getOrderId(),"");
}
// 师傅信息
@@ -923,7 +930,6 @@
System.out.println("服务端发送消息到: " + order.getServerId());
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
- return data ? R.ok() : R.fail();
}
return R.ok();
}
--
Gitblit v1.7.1