From a0eae3ecda7b70468c60a0079db6c4609c29939d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 09:36:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 f69ea9f..87f6b97 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
@@ -381,7 +381,7 @@
Order orderData = orderClient.detail(order.getOrderId()).getData();
- if(orderData.getState()==0 && (!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){
+ if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){
// 修改sys_change_dispatch 为已改派
dispatchClient.changeReason(order.getOrderId(),"");
}
@@ -562,8 +562,12 @@
R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
for (Order datum : result.getData()) {
- datum.setServeName(around(datum.getServeName(), 1, datum.getServeName().length()-1));
- datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
+ 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);
@@ -701,7 +705,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) {
--
Gitblit v1.7.1