From 3f62a93a0b0d64984cf070d0ca307a55faf95085 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 29 四月 2025 16:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 87f6b97..98e339a 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;
@@ -326,8 +327,8 @@
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
order.setAcceptTime(new Date());
- // 待上门
- order.setState(Constants.ONE);
+ // 待上门 2.0 改为待预约
+ order.setState(7);
} else {
// 待派单状态
order.setState(Constants.ZERO);
@@ -446,7 +447,7 @@
orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
if (order.getState().equals(Constants.SIX) || order.getState().equals(Constants.THREE)) {
- orderClient.updateState(order.getId(), Constants.ONE);
+ orderClient.updateState(order.getId(), 7);
//如果是待改派,将上门时间设置为最新的，并且更新再投原因
if (order.getState().equals(Constants.SIX)){
@@ -479,7 +480,7 @@
// result = dispatchClient.saveRecord(changeDispatch).getData();
}else {
orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
-
+ orderClient.updateState(order.getId(), 7);
}
ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
@@ -710,11 +711,11 @@
public R<List<MasterWorker>> map(String cityCode,String name) {
LoginUser loginUser = tokenService.getLoginUser();
- if (null == loginUser) {
- return R.loginExpire("登录失效！");
- }
+// if (null == loginUser) {
+// return R.loginExpire("登录失效！");
+// }
if (cityCode==null) {
- if (loginUser.getIsFranchisee()) {
+ if (loginUser!=null&&loginUser.getIsFranchisee()) {
cityCode = loginUser.getCityList().get(0);
} else {
cityCode = "420100";
@@ -724,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()+":"));
}
@@ -733,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");
@@ -767,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);
}
/**
@@ -863,6 +874,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