From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 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 55fc35b..32f12f1 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
@@ -457,10 +458,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();
@@ -758,6 +755,7 @@
order.setCompleteTime(new Date());
order.setState(Constants.THREE);
order.setFake(orderSubmitRequest.getFake());
+ order.setRemark(orderSubmitRequest.getRemark());
boolean update = orderService.updateById(order);
// 服务记录
ServeRecord serveRecord = new ServeRecord();
@@ -811,7 +809,7 @@
QueryWrapper<Order> wrapper = new QueryWrapper<>();
wrapper.eq("server_id", workerId)
- .in("state", 1, 2)
+ .in("state", 1, 2,7)
.eq("is_delete", Constants.ZERO)
.eq("DATE(time)", todayStr) // 添加这一行来筛选当天的订单
.orderByAsc("CASE WHEN topSort IS NULL THEN 1 ELSE 0 END")
@@ -890,14 +888,41 @@
*/
@ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
@GetMapping(value = "/call")
- public R<String> call(@RequestParam Integer orderId) {
+ public R<String> call(@RequestParam("orderId") String orderId) {
Order order = orderService.getById(orderId);
if(Objects.isNull(order)){
return R.fail("订单不存在");
}
- order.setState(2);
+ if(order.getState() == 7){
+ order.setState(1);
+ orderService.updateById(order);
+ }
+ return R.ok();
+ }
+ /**
+ * 领取补贴金
+ */
+ @GetMapping(value = "/receiving")
+ public R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy) {
+ Order order = orderService.getById(orderId);
+ if(Objects.isNull(order)){
+ return R.fail("订单不存在");
+ }
+ order.setSubsidy(recycleSubsidy);
+ order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
orderService.updateById(order);
return R.ok();
}
+ /**
+ * 领取补贴金
+ */
+ @GetMapping(value = "/getTodayOrderData")
+ public R<List<Order>> getTodayOrderData() {
+ List<Order> orders = orderService.list(Wrappers.lambdaQuery(Order.class)
+ .eq(Order::getTime, LocalDate.now())
+ .eq(Order::getIsDelete, 0));
+ return R.ok(orders);
+ }
+
}
--
Gitblit v1.7.1