From 242725f795b4cca830421c07f714a3ec36af0add Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 02 七月 2024 13:59:39 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 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 4302bd6..6b09cdf 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
@@ -3,11 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.entity.MasterWorker;
-import com.ruoyi.admin.entity.Order;
+import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.request.OrderQueryRequest;
-import com.ruoyi.admin.service.MasterWorkerService;
-import com.ruoyi.admin.service.OrderService;
+import com.ruoyi.admin.service.*;
import com.ruoyi.admin.sorcket.WebSocketServer;
import com.ruoyi.admin.vo.OrderCountVO;
import com.ruoyi.admin.vo.OrderDetailVO;
@@ -15,7 +13,6 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.SnowflakeIdWorker;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -25,6 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -47,6 +45,15 @@
private OrderService orderService;
@Resource
private MasterWorkerService masterWorkerService;
+ @Resource
+ private SiteService siteService;
+ @Resource
+ private RecoveryServeService recoveryServeService;
+ @Resource
+ private RecoveryServePriceService recoveryServePriceService;
+ @Resource
+ private ChangeDispatchService changeDispatchService;
+
/**
* 雪花算法类
*/
@@ -109,13 +116,11 @@
/**
* 订单列表
- *
- * @param orderQueryRequest 订单列表查询参数
*/
@ApiOperation(value = "订单列表-各订单数量统计", tags = {"后台-订单管理"})
- @PostMapping(value = "/orderPageCount")
- public R<OrderPageCountVO> orderPageCount(@RequestBody OrderQueryRequest orderQueryRequest) {
- return R.ok(orderService.orderPageCount(orderQueryRequest));
+ @GetMapping(value = "/orderPageCount")
+ public R<OrderPageCountVO> orderPageCount() {
+ return R.ok(orderService.orderPageCount());
}
/**
@@ -141,7 +146,39 @@
@ApiOperation(value = "订单列表-新增订单", tags = {"后台-订单管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody Order order) {
+ // 站点信息
+ Site site = siteService.lambdaQuery()
+ .eq(Site::getId, order.getSiteId())
+ .eq(Site::getIsDelete, 0).one();
+ order.setSiteName(site.getSiteName());
+ // 回收服务信息
+ RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
+ .eq(RecoveryServe::getId, order.getServeId())
+ .eq(RecoveryServe::getIsDelete, 0).one();
+ order.setServeName(recoveryServe.getServeName());
+ // 不同城市会有不同的回收价格
+ RecoveryServePrice price = recoveryServePriceService.lambdaQuery()
+ .eq(RecoveryServePrice::getRecoveryServeId, recoveryServe.getId())
+ .eq(RecoveryServePrice::getIsDelete, 0)
+ .eq(RecoveryServePrice::getCity, order.getCity()).one();
+ if (null == price) {
+ order.setServePrice(recoveryServe.getDefaultPrice());
+ order.setOrderMoney(recoveryServe.getDefaultPrice());
+ } else {
+ order.setServePrice(price.getRecoveryPrice());
+ order.setOrderMoney(price.getRecoveryPrice());
+ }
+ // 师傅信息
+ MasterWorker masterWorker = masterWorkerService.lambdaQuery()
+ .eq(MasterWorker::getId, order.getServerId())
+ .eq(MasterWorker::getIsDelete, 0).one();
+ order.setServerName(masterWorker.getRealName());
+ order.setServerPhone(masterWorker.getPhone());
+ // 后台订单
order.setType(Constants.ONE);
+ // 待派单状态
+ order.setState(Constants.ZERO);
+ order.setSubsidy(BigDecimal.ZERO);
order.setOrderNumber(String.valueOf(SNOW_FLAKE_ID_WORKER.nextId()));
return orderService.save(order) ? R.ok() : R.fail();
}
@@ -157,10 +194,11 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "操作类型(1:订单派单；2:订单改派)", name = "type", dataType = "Integer", required = true),
@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "服务人员id", name = "workerId", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "服务人员id", name = "workerId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
})
public R<String> reassignment(@RequestParam Integer type, @RequestParam Integer orderId,
- @RequestParam Integer workerId) {
+ @RequestParam Integer workerId, String applyReason) {
Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
.eq(MasterWorker::getId, workerId)
@@ -172,19 +210,26 @@
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
order.setAcceptTime(new Date());
+ order.setState(Constants.ONE);
result = orderService.updateById(order);
} else if (Constants.TWO.equals(type)) {
- order.setState(Constants.FIVE);
- orderService.updateById(order);
- Order itemOrder = new Order();
- BeanUtils.copyProperties(order, itemOrder);
- itemOrder.setId(null);
- itemOrder.setServerId(workerId);
- itemOrder.setServerName(masterWorker.getRealName());
- itemOrder.setServerPhone(masterWorker.getPhone());
- itemOrder.setAcceptTime(new Date());
- itemOrder.setState(Constants.ONE);
- result = orderService.save(itemOrder);
+ order.setServeId(workerId);
+ order.setServerName(masterWorker.getRealName());
+ order.setServerPhone(masterWorker.getPhone());
+ result = orderService.updateById(order);
+ // 生成改派信息
+ ChangeDispatch changeDispatch = new ChangeDispatch();
+ changeDispatch.setWorkerId(order.getServerId());
+ changeDispatch.setWorkerName(order.getServerName());
+ changeDispatch.setApplyReason(applyReason);
+ changeDispatch.setApplyTime(new Date());
+ changeDispatch.setState(Constants.ONE);
+ changeDispatch.setOrderId(String.valueOf(order.getId()));
+ changeDispatch.setOrderNumber(order.getOrderNumber());
+ changeDispatch.setUserId(String.valueOf(order.getUserId()));
+ changeDispatch.setUserName(order.getReservationName());
+ changeDispatch.setIsDelete(Constants.ZERO);
+ changeDispatchService.save(changeDispatch);
}
try {
WebSocketServer.sendInfo("您有一条新的订单，请注意查收！", String.valueOf(workerId));
@@ -214,12 +259,12 @@
/**
* 订单列表-excel导出
*
- * @param idList 订单id
+ * @param orderQueryRequest 筛选参数
*/
@ApiOperation(value = "订单列表-excel导出", tags = {"后台-订单管理"})
@PostMapping(value = "/excelExport")
- public R<String> excelExport(@RequestBody List<String> idList, HttpServletResponse response) {
- return orderService.excelExport(idList, response);
+ public R<String> excelExport(@RequestBody OrderQueryRequest orderQueryRequest, HttpServletResponse response) {
+ return orderService.excelExport(orderQueryRequest, response);
}
/**
--
Gitblit v1.7.1