From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 8469bf1..b080f34 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
@@ -312,8 +312,8 @@
order.setServerPhone(phone);
orderService.updateById(order);
}
- List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, orderId).list();
- changeDispatchService.removeBatchByIds(list);
+// List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, orderId).list();
+// changeDispatchService.removeBatchByIds(list);
return R.ok(order);
}
@@ -400,8 +400,8 @@
).set(Order::getArriveTime, null).update();
//删除改派管理的订单
- List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, order.getId()).list();
- changeDispatchService.removeBatchByIds(list);
+// List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, order.getId()).list();
+// changeDispatchService.removeBatchByIds(list);
}
// }
@@ -517,9 +517,10 @@
}
@GetMapping(value = "/updateArrivalTime")
- public R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")Date arriveTime) {
+ public R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime) {
Order byId = orderService.getById(orderId);
- byId.setArriveTime(arriveTime);
+ byId.setTime(arriveTime);
+ orderService.updateById(byId);
return R.ok();
}
@@ -591,7 +592,8 @@
@RequestParam("siteIds") List<String> siteIds
) {
Page<Order> page = orderService.lambdaQuery().eq(Order::getUserId, userId)
- .eq(Order::getIsDelete, 0).in(!siteIds.isEmpty(),Order::getSiteId, siteIds).in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
+ .eq(Order::getIsDelete, 0)
+ .in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1