From 64b4be369b925296fd0bb70166fe5fb2d6da5807 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 一月 2025 19:38:59 +0800
Subject: [PATCH] 订单编辑修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 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 a06e937..90cc8ab 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
@@ -21,6 +21,7 @@
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.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.GaoDeMapUtil;
import com.ruoyi.common.core.utils.SnowflakeIdWorker;
@@ -47,13 +48,12 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -99,6 +99,8 @@
private ExchangeDispatchClient dispatchClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private ChangeDispatchService changeDispatchService;
/**
* 雪花算法类
@@ -379,6 +381,18 @@
order.setSiteName(site.getSiteName());
}
+ if(StringUtils.hasLength(order.getTime()) || Objects.nonNull(order.getServerId())){
+ // 修改sys_change_dispatch 为已改派
+ ChangeDispatch changeDispatch = changeDispatchService.lambdaQuery()
+ .eq(ChangeDispatch::getOrderId, order.getOrderId())
+ .eq(ChangeDispatch::getIsDelete, 0)
+ .last("limit 1").one();
+ if(Objects.nonNull(changeDispatch)){
+ changeDispatch.setState(Constants.ONE);
+ changeDispatchService.updateById(changeDispatch);
+ }
+ }
+
// 师傅信息
if (null != order.getServerId()) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
@@ -421,12 +435,7 @@
@RequiresPermissions("order_reassignment")
@ApiOperation(value = "订单列表-订单派单/改派", tags = {"后台-订单管理"})
@PostMapping(value = "/reassignment")
- @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 = "改派原因", name = "applyReason", dataType = "String")
- })
+
@Transactional(rollbackFor = Exception.class)
public R<String> reassignment(@RequestBody OrderReasinDto orderReasinDto) {
// String[] split = orderIds.split(",");
@@ -441,13 +450,25 @@
// 订单派单
boolean result = true;
if (Constants.TWO.equals(orderId.getType())) {
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
orderClient.updateState(order.getId(), Constants.ONE);
+
+ //如果是待改派,将上门时间设置为最新的，并且更新再投原因
+ if (order.getState().equals(Constants.SIX)){
+ dispatchClient.changeReason(order.getId(), "");
+ }
+
}
// 订单状态为 待完工时，需要更改状态 待上门且清空师傅到达预约点时间
if (order.getState().equals(Constants.TWO)) {
orderClient.updateStateAndArrivalTime(orderId.getOrderId(), Constants.ONE);
}
+
+
+
+
// 生成改派信息
// ChangeDispatch changeDispatch = new ChangeDispatch();
// changeDispatch.setWorkerId(item.getServerId());
@@ -463,6 +484,9 @@
// changeDispatch.setUserName(item.getReservationName());
// changeDispatch.setIsDelete(Constants.ZERO);
// result = dispatchClient.saveRecord(changeDispatch).getData();
+ }else {
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
}
ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
@@ -756,6 +780,21 @@
// return R.ok(list);
// }
+ @ApiOperation(value = "导入模板下载", tags = {"管理后台"})
+ @PostMapping(value = "/importTemplate")
+ public R<String> importTemplate(HttpServletResponse response) throws Exception {
+ List<FrozenBuckleImportDTO> list = new ArrayList<>();
+ FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
+ list.add(bean);
+ // 这里URLEncoder.encode可以防止中文乱码
+ String fileName = URLEncoder.encode("订单导入模板", "UTF-8");
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), FrozenBuckleImportDTO.class).sheet("订单导入模板").doWrite(list);
+ return R.ok("下载成功!");
+ }
+
/**
* 管理后台-订单导入
*/
@@ -800,7 +839,7 @@
// 设置sheet,默认读取第一个
.sheet()
// 设置标题(字段列表)所在行数
- .headRowNumber(2)
+ .headRowNumber(1)
.doRead();
System.err.println(successArrayList);
@@ -816,8 +855,19 @@
String area = frozenBuckleImportDTO.getArea();
String address = frozenBuckleImportDTO.getReservationAddress();
+ String time = frozenBuckleImportDTO.getTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try{
+ format.parse(time);
+ }catch (Exception e){
+ throw new ServiceException("上门时间格式错误");
+ }
+
// 解析地址经纬度
CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
+ if(Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
+ return R.fail("地址输入不正确");
+ }
String areaCode = cityInfoVO.getCode();
String provinceCode = areaCode.substring(0, 2) + "0000";
String cityCode = areaCode.substring(0, 4) + "00";
@@ -831,6 +881,8 @@
Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
if(Objects.nonNull(site)){
order.setSiteId(site.getId());
+ }else {
+ return R.fail("站点信息不存在");
}
// 师傅信息
if (StringUtils.hasLength(order.getServerName())) {
@@ -838,6 +890,8 @@
if(Objects.nonNull(masterWorker)){
order.setServerId(masterWorker.getId());
order.setServerPhone(masterWorker.getPhone());
+ }else {
+ return R.fail("师傅信息不存在");
}
order.setAcceptTime(new Date());
// 待上门
@@ -855,6 +909,8 @@
if(Objects.nonNull(recoveryServe)){
order.setServeId(recoveryServe.getId());
order.setServePrice(recoveryServe.getDefaultPrice());
+ }else {
+ return R.fail("服务信息不存在");
}
RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getCity, order.getCityCode()).eq(RecoveryServePrice::getRecoveryServeId, order.getServeId()).eq(BaseEntity::getIsDelete, 0).one();
if (one==null) {
--
Gitblit v1.7.1