From 2855ae89d2ab6268e1edc42c3e9d7e73c8e7259e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 03 九月 2024 10:09:24 +0800
Subject: [PATCH] 8.9

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 82123fc..bbb2faf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -313,6 +313,7 @@
 
         order.setTime(orderRequest.getTime());
         order.setAcceptTime(orderRequest.getAcceptTime());
+//        order.setAcceptTime(new Date());
         // 师傅信息
         order.setServerId(orderRequest.getServerId());
         order.setServerName(orderRequest.getServerName());
@@ -420,6 +421,12 @@
         List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
         List<Order> list = orderService.lambdaQuery().in(Order::getId, idList).list();
         list.forEach(data -> data.setIsDelete(1));
+
+        List<ChangeDispatch> list1 = changeDispatchService.lambdaQuery().in(ChangeDispatch::getOrderId, idList).list();
+        if (!list1.isEmpty()) {
+            list1.forEach(data -> data.setIsDelete(1));
+            changeDispatchService.updateBatchById(list1);
+        }
         return R.ok(orderService.updateBatchById(list));
     }
 

--
Gitblit v1.7.1