From 2ed7e2be73557c99e04a878887f3a2d99eeb66e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 15:44:20 +0800
Subject: [PATCH] 2.0迭代
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 16 +++++++++++++---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 8 +++++---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 2 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 2 +-
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 4 ++--
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 955dcea..ad9706a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -258,7 +258,7 @@
}
@Override
- public R<String> call(Integer orderId) {
+ public R<String> call(String orderId) {
return R.fail(cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 48519fd..fe65ad2 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -443,5 +443,5 @@
* @return
*/
@GetMapping(value = "/order/call")
- R<String> call(@RequestParam("orderId")Integer orderId);
+ R<String> call(@RequestParam("orderId")String orderId);
}
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 2ff3bd2..9334b7a 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
@@ -725,7 +725,10 @@
if (workIds==null||workIds.isEmpty()){
return R.ok(new ArrayList<>());
}
- List<MasterWorker> list = masterWorkerService.lambdaQuery().in(MasterWorker::getId, workIds).eq(name!=null&&name!="",MasterWorker::getRealName,name).eq(cityCode!=null&&cityCode!="", MasterWorker::getCityCode,cityCode).list();
+ List<MasterWorker> list = masterWorkerService.lambdaQuery()
+ .in(MasterWorker::getId, workIds)
+ .eq(name!=null&&name!="",MasterWorker::getRealName,name)
+ .eq(cityCode!=null&&cityCode!=""&&!cityCode.contains("0000"), MasterWorker::getCityCode,cityCode).list();
for (MasterWorker masterWorker : list) {
masterWorker.setLacation(redisService.getCacheObject("work:"+masterWorker.getId()+":"));
}
@@ -734,7 +737,10 @@
@ApiOperation(value = "获师傅", tags = {"后台-订单管理-地图统计"})
@PostMapping(value = "/map/line")
- public R<List<OrderByServeRecordVO>> line(Integer id) {
+ public R<Map<String,Object>> line(Integer id) {
+
+ Map<String,Object> map = new HashMap<>();
+
List<OrderByServeRecordVO> list = new ArrayList<>();
// 获取当天时间
String today = DateUtils.dateTimeNow("yyyy-MM-dd");
@@ -768,7 +774,11 @@
}
list.add(orderByServeRecord);
}
- return R.ok(list);
+ map.put("orderByServeRecordVO", list);
+ MasterWorker masterWorker = masterWorkerService.getById(id);
+ map.put("masterWorker", masterWorker);
+
+ return R.ok(map);
}
/**
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 0a1833a..d504f4f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -886,13 +886,15 @@
*/
@ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
@GetMapping(value = "/call")
- public R<String> call(@RequestParam("orderId") Integer orderId) {
+ public R<String> call(@RequestParam("orderId") String orderId) {
Order order = orderService.getById(orderId);
if(Objects.isNull(order)){
return R.fail("订单不存在");
}
- order.setState(2);
- orderService.updateById(order);
+ if(order.getState() == 7){
+ order.setState(2);
+ orderService.updateById(order);
+ }
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
index c3fbdc1..3ea627a 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -640,9 +640,9 @@
@ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
@GetMapping(value = "/workerCall")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
})
- public R<String> workerCall(@RequestParam Integer orderId) {
+ public R<String> workerCall(@RequestParam String orderId) {
orderClient.call(orderId);
return R.ok();
}
--
Gitblit v1.7.1