From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 6b09cdf..ebbe530 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -118,9 +118,9 @@
* 订单列表
*/
@ApiOperation(value = "订单列表-各订单数量统计", tags = {"后台-订单管理"})
- @GetMapping(value = "/orderPageCount")
- public R<OrderPageCountVO> orderPageCount() {
- return R.ok(orderService.orderPageCount());
+ @PostMapping(value = "/orderPageCount")
+ public R<OrderPageCountVO> orderPageCount(@RequestBody OrderQueryRequest orderQueryRequest) {
+ return R.ok(orderService.orderPageCount(orderQueryRequest));
}
/**
@@ -139,7 +139,7 @@
/**
* 新增订单
- * 后台订单与用户端及师傅端无关联
+ * 后台订单为指定订单，默认为待上门状态
*
* @param order 站点信息
*/
@@ -177,15 +177,14 @@
// 后台订单
order.setType(Constants.ONE);
// 待派单状态
- order.setState(Constants.ZERO);
+ order.setState(Constants.ONE);
order.setSubsidy(BigDecimal.ZERO);
order.setOrderNumber(String.valueOf(SNOW_FLAKE_ID_WORKER.nextId()));
return orderService.save(order) ? R.ok() : R.fail();
}
/**
- * 新增订单
- * 后台订单与用户端及师傅端无关联
+ * 订单派单/改派
*
* @param type 1:订单派单；2:订单改派
*/
@@ -199,7 +198,8 @@
})
public R<String> reassignment(@RequestParam Integer type, @RequestParam Integer orderId,
@RequestParam Integer workerId, String applyReason) {
- Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
+ Order order = orderService.lambdaQuery().eq(Order::getId, orderId)
+ .eq(Order::getIsDelete, 0).one();
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, workerId)
.eq(MasterWorker::getIsDelete, 0).one();
@@ -213,7 +213,9 @@
order.setState(Constants.ONE);
result = orderService.updateById(order);
} else if (Constants.TWO.equals(type)) {
- order.setServeId(workerId);
+ order.setServerId(workerId);
+ // 更新接单时间
+ order.setAcceptTime(new Date());
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
result = orderService.updateById(order);
@@ -226,7 +228,9 @@
changeDispatch.setState(Constants.ONE);
changeDispatch.setOrderId(String.valueOf(order.getId()));
changeDispatch.setOrderNumber(order.getOrderNumber());
- changeDispatch.setUserId(String.valueOf(order.getUserId()));
+ if (null != order.getUserId()) {
+ changeDispatch.setUserId(String.valueOf(order.getUserId()));
+ }
changeDispatch.setUserName(order.getReservationName());
changeDispatch.setIsDelete(Constants.ZERO);
changeDispatchService.save(changeDispatch);
--
Gitblit v1.7.1