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 | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 a7453a3..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;
@@ -562,8 +563,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 +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) {
@@ -859,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();
+ }
/**
* 最简单的读的监听器
--
Gitblit v1.7.1