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/ChangeDispatchController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java
index 2622b2a..0d7415f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -18,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -51,6 +53,7 @@
@PostMapping(value = "/page")
@ApiImplicitParams({
@ApiImplicitParam(value = "师傅名称", name = "workerName", dataType = "String"),
+ @ApiImplicitParam(value = "预约人姓名", name = "reservationName", dataType = "String"),
@ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),
@ApiImplicitParam(value = "下单用户名称", name = "userName", dataType = "String"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@@ -59,6 +62,13 @@
public R<Page<ChangeDispatch>> queryPageList(@RequestBody ChangeDispatchRequest request) {
Page<ChangeDispatch> page = changeDispatchService.queryPageList(request, Page.of(request.getPageNum(),
request.getPageSize()));
+ for (ChangeDispatch record : page.getRecords()) {
+ Order byId = orderService.getById(record.getOrderId());
+// if (byId!=null){
+// record.setType(byId.getType());
+//
+// }
+ }
return R.ok(page);
}
@@ -187,6 +197,14 @@
return R.ok(update && orderService.updateById(order));
}
+ @GetMapping(value = "/changeReason")
+ public void changeReason(@RequestParam("id")String id,@RequestParam("reason") String reason) {
+ ChangeDispatch one = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, id).orderByDesc(BaseEntity::getCreateTime).last("limit 1").one();
+ one.setState(1);
+// one.setApplyReason(reason);
+ changeDispatchService.updateById(one);
+ }
+
/**
* 根据id批量删除订单改派
*
@@ -237,9 +255,9 @@
.set(Order::getIsReinvest, Constants.ONE)
.set(Order::getAcceptTime, new Date())
.set(Order::getArriveTime, null)
- .set(Order::getCompleteTime, null)
+ .set(Order::getCompleteTime, null).set(Order::getAcceptTime, LocalDateTime.now())
// 原订单状态改为 1:待上门，已选择师傅
- .set(Order::getState, Constants.ONE)
+ .set(Order::getState, Constants.ONE).set(Order::getServerId, workerId).set(Order::getServerName, name).set(Order::getServerPhone, phone)
.eq(Order::getId, order.getId()).update();
// 改派信息
boolean update = changeDispatchService.lambdaUpdate().set(ChangeDispatch::getState, 1)
--
Gitblit v1.7.1