From f198eb8efc4cc3c53e6b5839dabb4aae4c68510c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 08 一月 2025 17:16:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 4269671..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);
}
// }
@@ -516,6 +516,14 @@
return R.ok(!list.isEmpty());
}
+ @GetMapping(value = "/updateArrivalTime")
+ public R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime) {
+ Order byId = orderService.getById(orderId);
+ byId.setTime(arriveTime);
+ orderService.updateById(byId);
+ return R.ok();
+ }
+
/**
* 回收订单统计
*
@@ -584,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