From 79e6a7f880512f4773f03fc015eb10cf9c401f73 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 14:13:31 +0800
Subject: [PATCH] 2.0迭代
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 100 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 19 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 90cc8ab..2ff3bd2 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
@@ -62,6 +62,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -99,8 +100,6 @@
private ExchangeDispatchClient dispatchClient;
@Resource
private TokenService tokenService;
- @Resource
- private ChangeDispatchService changeDispatchService;
/**
* 雪花算法类
@@ -191,13 +190,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());
@@ -381,16 +380,11 @@
order.setSiteName(site.getSiteName());
}
- if(StringUtils.hasLength(order.getTime()) || Objects.nonNull(order.getServerId())){
+ Order orderData = orderClient.detail(order.getOrderId()).getData();
+
+ if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.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);
- }
+ dispatchClient.changeReason(order.getOrderId(),"");
}
// 师傅信息
@@ -528,17 +522,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, "*");
}
/**
@@ -665,7 +706,7 @@
@Resource
private RedisService redisService;
- @ApiOperation(value = "地图统计", tags = {"后台-订单管理-地图统计"})
+ @ApiOperation(value = "地图统计", tags = {"后台-订单管理-地图统计[2.0]"})
@PostMapping(value = "/map/works")
public R<List<MasterWorker>> map(String cityCode,String name) {
@@ -823,6 +864,20 @@
return R.ok();
}
+ /**
+ * 批量修改订单时间
+ * @param ids 站点多条id拼接
+ */
+ @ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"})
+ @GetMapping(value = "/batchOrderUpdateTime")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "多个id ',' 拼接", name = "ids", dataType = "String", required = true),
+ @ApiImplicitParam(value = "修改上门时间", name = "time", dataType = "String", required = true),
+ })
+ public R<Boolean> batchOrderUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) {
+ orderClient.batchUpdateTime(ids, time);
+ return R.ok();
+ }
/**
* 最简单的读的监听器
@@ -863,9 +918,15 @@
throw new ServiceException("上门时间格式错误");
}
+ if(!StringUtils.hasLength(address)){
+ return R.fail("详细地址不能为空");
+ }
// 解析地址经纬度
- CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
- if(Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
+ 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();
@@ -876,7 +937,9 @@
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)){
@@ -929,7 +992,6 @@
System.out.println("服务端发送消息到: " + order.getServerId());
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
- return data ? R.ok() : R.fail();
}
return R.ok();
}
--
Gitblit v1.7.1