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-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 f598920..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();
@@ -653,10 +649,10 @@
*/
@ApiOperation(value = "师傅端-订单列表", tags = {"师傅端"})
@GetMapping(value = "/orderListWorker")
- public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
+ public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return R.ok(orderService.orderListWorker(userId, state, pageNum, pageSize));
+ return R.ok(orderService.orderListWorker(userId, state, searchValues,pageNum, pageSize));
}
/**
@@ -885,4 +881,19 @@
return R.ok(orderService.placeOrder(userOrderRequest));
}
+ /**
+ * 师傅端-打电话
+ */
+ @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
+ @GetMapping(value = "/call")
+ public R<String> call(@RequestParam Integer orderId) {
+ Order order = orderService.getById(orderId);
+ if(Objects.isNull(order)){
+ return R.fail("订单不存在");
+ }
+ order.setState(2);
+ orderService.updateById(order);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1