From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 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 06c042a..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
@@ -1,15 +1,15 @@
package com.ruoyi.order.controller;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.entity.ChangeDispatch;
import com.ruoyi.order.entity.Order;
+import com.ruoyi.order.request.ChangeDispatchRequest;
import com.ruoyi.order.service.ChangeDispatchService;
import com.ruoyi.order.service.OrderService;
import io.swagger.annotations.Api;
@@ -19,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;
@@ -45,30 +46,30 @@
/**
* 订单改派分页列表
*
- * @param pageNum 页码
- * @param pageSize 每页显示条数
+ * @param request 查询参数
*/
@RequiresPermissions("reassignment_apply")
@ApiOperation(value = "订单改派分页查询列表", tags = {"后台-系统设置-订单改派管理"})
- @GetMapping(value = "/page")
+ @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),
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
- public R<Page<ChangeDispatch>> queryPageList(@RequestParam(value = "workerName", required = false) String workerName,
- @RequestParam(value = "orderNumber", required = false) String orderNumber,
- @RequestParam(value = "userName", required = false) String userName,
- @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- LambdaQueryChainWrapper<ChangeDispatch> wrapper = changeDispatchService.lambdaQuery();
- wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(ChangeDispatch::getWorkerName, workerName) : wrapper;
- wrapper = StringUtils.isNotBlank(orderNumber) ? wrapper.like(ChangeDispatch::getOrderNumber, orderNumber) : wrapper;
- wrapper = StringUtils.isNotBlank(userName) ? wrapper.like(ChangeDispatch::getUserName, userName) : wrapper;
- return R.ok(wrapper.eq(ChangeDispatch::getIsDelete, 0)
- .orderByDesc(ChangeDispatch::getCreateTime).page(Page.of(pageNum, pageSize)));
+ 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);
}
/**
@@ -192,7 +193,16 @@
.eq(Order::getId, changeDispatch.getOrderId())
.eq(Order::getIsDelete, 0).one();
order.setState(Constants.ONE);
+ Integer serverId = order.getServerId();
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);
}
/**
@@ -240,24 +250,15 @@
if (null == order) {
throw new GlobalException("订单不存在！");
}
- // 原订单状态改为 1:待上门，已选择师傅
- order.setState(Constants.ONE);
// 更改订单信息为再投单
- boolean orderUpdate = orderService.lambdaUpdate().set(Order::getIsReinvest, Constants.ONE)
+ boolean orderUpdate = orderService.lambdaUpdate()
+ .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::getServerId, workerId).set(Order::getServerName, name).set(Order::getServerPhone, phone)
.eq(Order::getId, order.getId()).update();
- // 生成新订单信息
-// Order newOrder = new Order();
-// BeanUtils.copyProperties(order, newOrder);
-// newOrder.setId(null);
-// newOrder.setServerId(workerId);
-// newOrder.setServerName(name);
-// newOrder.setServerPhone(phone);
-// newOrder.setState(Constants.ONE);
-// // 构建新订单
-// boolean save = orderService.save(newOrder);
// 改派信息
boolean update = changeDispatchService.lambdaUpdate().set(ChangeDispatch::getState, 1)
.eq(ChangeDispatch::getId, changeId).eq(ChangeDispatch::getIsDelete, 0).update();
--
Gitblit v1.7.1