From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 128 ++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 25 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 8583b8c..aa76797 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;
@@ -52,6 +53,7 @@
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;
@@ -187,13 +189,13 @@
Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
+ List<MasterWorker> list = masterWorkerService.lambdaQuery()
+ .eq(MasterWorker::getIsDelete, 0).list();
if (null != data) {
for (Order record : data.getRecords()) {
// 回收服务信息
Integer serverId = record.getServerId();
- MasterWorker masterWorker = masterWorkerService.lambdaQuery()
- .eq(MasterWorker::getId, serverId)
- .eq(MasterWorker::getIsDelete, 0).one();
+ MasterWorker masterWorker = list.stream().filter(e -> e.getId().equals(serverId)).findFirst().orElse(null);
if (null != masterWorker) {
record.setServerName(masterWorker.getRealName());
record.setServerPhone(masterWorker.getPhone());
@@ -377,6 +379,13 @@
order.setSiteName(site.getSiteName());
}
+ Order orderData = orderClient.detail(order.getOrderId()).getData();
+
+ if(!order.getTime().equals(orderData.getTime()) || (Objects.nonNull(order.getServerId())&&Objects.nonNull(orderData.getServerId())&&!order.getServerId().equals(orderData.getServerId()))){
+ // 修改sys_change_dispatch 为已改派
+ dispatchClient.changeReason(order.getOrderId(),"");
+ }
+
// 师傅信息
if (null != order.getServerId()) {
MasterWorker masterWorker = masterWorkerService.lambdaQuery()
@@ -419,12 +428,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(",");
@@ -439,13 +443,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());
@@ -461,6 +477,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) {
@@ -502,17 +521,64 @@
@ApiOperation(value = "订单列表-excel导出", tags = {"后台-订单管理"})
@PostMapping(value = "/excelExport")
public R<String> excelExport(@RequestBody OrderQueryRequest orderQueryRequest, HttpServletResponse response) {
+
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ if (loginUser.getIsFranchisee()) {
+ if (null == orderQueryRequest.getCityList() || orderQueryRequest.getCityList().isEmpty()) {
+ orderQueryRequest.setCityList(loginUser.getCityList());
+ } else {
+ orderQueryRequest.getCityList().addAll(loginUser.getCityList());
+ }
+ }
List<Integer> servIds = new ArrayList<>();
if (orderQueryRequest.getClassNameId()!=null){
List<Integer> classIds = recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getId, orderQueryRequest.getClassNameId()).list().stream().map(RecoveryClassify::getId).collect(Collectors.toList());
servIds = recoveryServeService.lambdaQuery().eq(BaseEntity::getIsDelete,0).in(RecoveryServe::getClassifyId, classIds).list().stream().map(RecoveryServe::getId).collect(Collectors.toList());
}
+ if(orderQueryRequest.getServeId()!=null){
+ servIds.add(orderQueryRequest.getServeId());
+ }
orderQueryRequest.setServIds(servIds);
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ String[] siteIds = byId.getSiteIds().split(",");
+ orderQueryRequest.setSiteIds(siteIds);
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return orderService.excelExport(new ArrayList<>(), response);
+ }
+ }
+
+// List<Integer> servIds = new ArrayList<>();
+// if (orderQueryRequest.getClassNameId()!=null){
+// List<Integer> classIds = recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getId, orderQueryRequest.getClassNameId()).list().stream().map(RecoveryClassify::getId).collect(Collectors.toList());
+// servIds = recoveryServeService.lambdaQuery().eq(BaseEntity::getIsDelete,0).in(RecoveryServe::getClassifyId, classIds).list().stream().map(RecoveryServe::getId).collect(Collectors.toList());
+// }
+// orderQueryRequest.setServIds(servIds);
R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
+ for (Order datum : result.getData()) {
+ if(StringUtils.hasLength(datum.getServerName())){
+ datum.setServerName(datum.getServerName().charAt(0)+"***");
+ }
+ if(StringUtils.hasLength(datum.getServerPhone())){
+ datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
+ }
+ }
// 独立orderService
return orderService.excelExport(result.getData(), response);
+ }
+
+ private static String around(String str, int left, int right){
+ if (str == null || (str.length() < left + right +1)){
+ return str;
+ }
+ String regex = String.format("(?<=\\w{%d})\\w(?=\\w{%d})", left, right);
+ return str.replaceAll(regex, "*");
}
/**
@@ -759,19 +825,7 @@
public R<String> importTemplate(HttpServletResponse response) throws Exception {
List<FrozenBuckleImportDTO> list = new ArrayList<>();
FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
- bean.setSiteName("站点名称");
- bean.setServeName("服务信息");
- bean.setReservationName("预约姓名");
- bean.setReservationPhone("预约电话");
- bean.setProvince("省份");
- bean.setCity("市");
- bean.setArea("区");
- bean.setReservationAddress("详细地址");
- bean.setCustClass("上门时间");
- bean.setServerName("服务人员");
- bean.setReservationRemark("备注");
list.add(bean);
-
// 这里URLEncoder.encode可以防止中文乱码
String fileName = URLEncoder.encode("订单导入模板", "UTF-8");
response.setContentType("application/vnd.ms-excel");
@@ -825,7 +879,7 @@
// 设置sheet,默认读取第一个
.sheet()
// 设置标题(字段列表)所在行数
- .headRowNumber(2)
+ .headRowNumber(1)
.doRead();
System.err.println(successArrayList);
@@ -841,8 +895,25 @@
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("上门时间格式错误");
+ }
+
+ if(!StringUtils.hasLength(address)){
+ return R.fail("详细地址不能为空");
+ }
// 解析地址经纬度
- CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
+ CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo((province==null?"":province)
+ + (city==null?"":city)
+ + (area==null?"":area)
+ + address).getDatas();
+ if(cityInfoVO==null||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";
@@ -851,11 +922,15 @@
order.setAreaCode(areaCode);
order.setLongitude(cityInfoVO.getLongitude());
order.setLatitude(cityInfoVO.getLatitude());
-
+ if (!StringUtils.hasLength(city)){
+ order.setCity(cityInfoVO.getCity());
+ }
// 站点信息
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())) {
@@ -863,6 +938,8 @@
if(Objects.nonNull(masterWorker)){
order.setServerId(masterWorker.getId());
order.setServerPhone(masterWorker.getPhone());
+ }else {
+ return R.fail("师傅信息不存在");
}
order.setAcceptTime(new Date());
// 待上门
@@ -880,6 +957,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) {
@@ -898,7 +977,6 @@
System.out.println("服务端发送消息到: " + order.getServerId());
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
- return data ? R.ok() : R.fail();
}
return R.ok();
}
--
Gitblit v1.7.1