From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
index ab93803..61fbf3f 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
@@ -75,7 +75,12 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
+ if (order.getAddress()!=null) {
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
+ }else {
+ orderListVO.setReservationAddress(order.getReservationAddress());
+
+ }
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
@@ -89,6 +94,7 @@
orderListVO.setLongitude(order.getLongitude());
orderListVO.setLatitude(order.getLatitude());
orderListVO.setTopSort(topSort);
+ orderListVO.setFake(order.getFake()==null?0:order.getFake());
OrderNotHandleVO vo = new OrderNotHandleVO(distance, orderListVO);
list.add(vo);
}
@@ -152,7 +158,12 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
+ if (order.getAddress()!=null) {
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
+ }else {
+ orderListVO.setReservationAddress(order.getReservationAddress());
+
+ }
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
--
Gitblit v1.7.1