From 0717706709a4a864524d3cd218da5d2a39973a75 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 14:11:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 15 +++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 4 ----
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 5 +++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 9 +++++++++
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 16d9c17..42ad4fa 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -253,6 +253,11 @@
}
@Override
+ public R<Boolean> batchUpdateTime(String ids, String time) {
+ return R.fail(cause.getMessage());
+ }
+
+ @Override
public R<Boolean> changeOrderState(String orderId, Integer state) {
return R.fail(cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 0241f39..9487cf5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -428,4 +428,13 @@
@RequestParam("pageSize") Integer pageSize);
@GetMapping(value = "/order/updateArrivalTime")
R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime);
+
+ /**
+ * 批量修改上门时间
+ * @param ids
+ * @param time
+ * @return
+ */
+ @GetMapping(value = "/order/batchUpdateTime")
+ R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("arriveTime")String time);
}
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 87f6b97..2ff3bd2 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
@@ -62,6 +62,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -863,6 +864,20 @@
return R.ok();
}
+ /**
+ * 批量修改订单时间
+ * @param ids 站点多条id拼接
+ */
+ @ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"})
+ @GetMapping(value = "/batchOrderUpdateTime")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "多个id ',' 拼接", name = "ids", dataType = "String", required = true),
+ @ApiImplicitParam(value = "修改上门时间", name = "time", dataType = "String", required = true),
+ })
+ public R<Boolean> batchOrderUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) {
+ orderClient.batchUpdateTime(ids, time);
+ return R.ok();
+ }
/**
* 最简单的读的监听器
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 55fc35b..4f7e4be 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
@@ -457,10 +457,6 @@
*/
@ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"})
@GetMapping(value = "/batchUpdateTime")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "多个id ',' 拼接", name = "ids", dataType = "String", required = true),
- @ApiImplicitParam(value = "修改上门时间", name = "time", dataType = "String", required = true),
- })
public R<Boolean> batchUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) {
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
List<Order> list = orderService.lambdaQuery().in(Order::getId, idList).list();
--
Gitblit v1.7.1