From 98de7181a8e13420734f75d2eba62f1aef298643 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 一月 2025 19:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..eb728c0 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
@@ -191,13 +191,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());
@@ -863,9 +863,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 +882,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 +937,6 @@
System.out.println("服务端发送消息到: " + order.getServerId());
NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
}
- return data ? R.ok() : R.fail();
}
return R.ok();
}
--
Gitblit v1.7.1