From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
index 520c342..4d40e73 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
@@ -61,13 +61,16 @@
@GetMapping(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 = "reservationPhone", dataType = "String"),
@ApiImplicitParam(value = "地址", name = "reservationAddress", dataType = "String"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<Page<ChangeDispatch>> queryPageList(String workerName, String orderNumber, String userName,String reservationAddress,
+ String reservationName,String reservationPhone,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LoginUser loginUser = tokenService.getLoginUser();
@@ -83,7 +86,8 @@
changeDispatchRequest.setPageNum(pageNum);
changeDispatchRequest.setPageSize(pageSize);
changeDispatchRequest.setCityList(cityList);
-
+ changeDispatchRequest.setReservationName(reservationName);
+ changeDispatchRequest.setReservationPhone(reservationPhone);
Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
if (franchiseeId!=null) {
Franchisee byId = franchiseeService.getById(franchiseeId);
@@ -163,10 +167,14 @@
@ApiOperation(value = "订单改派师傅", tags = {"后台-系统设置-订单改派管理"})
@GetMapping(value = "/changeWorker")
@ApiImplicitParams({
- @ApiImplicitParam(value = "改派订单id", name = "changeId", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "师傅id", name = "workerId", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "改派订单id", name = "changeId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "师傅id", name = "workerId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "时间", name = "arriveTime", dataType = "String", required = true),
})
- public R<String> changeWorker(@RequestParam String changeId, @RequestParam Integer workerId,@RequestParam String orderId,@RequestParam String reason,
+ public R<String> changeWorker(@RequestParam String changeId,
+ @RequestParam String orderId,
+ @RequestParam Integer workerId,
@RequestParam String arriveTime) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, workerId).eq(MasterWorker::getIsDelete, 0).one();
@@ -184,7 +192,7 @@
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
- dispatchClient.changeReason(orderId, reason);
+// dispatchClient.changeReason(orderId, reason);
orderClient.updateArrivalTime(orderId,arriveTime);
return R.ok();
// try {
--
Gitblit v1.7.1