From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 10630de..ab93803 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
@@ -59,8 +59,7 @@
Long distance = result.getDatas();
// 回收服务信息
RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
- .eq(RecoveryServe::getId, order.getServeId())
- .eq(RecoveryServe::getIsDelete, 0).one();
+ .eq(RecoveryServe::getId, order.getServeId()).one();
// vo类信息封装
OrderListVO orderListVO = new OrderListVO();
orderListVO.setOrderId(order.getId());
@@ -76,7 +75,7 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress());
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
@@ -112,8 +111,7 @@
for (OrderListVO orderListVO : resultList) {
Integer serveId = orderListVO.getServeId();
// 回收服务信息
- RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId)
- .eq(RecoveryServe::getIsDelete, 0).one();
+ RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId).one();
if (null != recoveryServe) {
orderListVO.setServePicture(recoveryServe.getCover());
}
@@ -138,8 +136,7 @@
Long distance = result.getDatas();
// 回收服务信息
RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
- .eq(RecoveryServe::getId, order.getServeId())
- .eq(RecoveryServe::getIsDelete, 0).one();
+ .eq(RecoveryServe::getId, order.getServeId()).one();
// vo类信息封装
OrderListVO orderListVO = new OrderListVO();
orderListVO.setOrderId(order.getId());
@@ -155,7 +152,7 @@
orderListVO.setUserId(userid);
orderListVO.setReservationName(order.getReservationName());
orderListVO.setReservationPhone(order.getReservationPhone());
- orderListVO.setReservationAddress(order.getReservationAddress());
+ orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
orderListVO.setTime(order.getTime());
orderListVO.setServerId(order.getServerId());
orderListVO.setServerName(order.getServerName());
@@ -178,8 +175,7 @@
for (OrderListVO orderListVO : resultList) {
Integer serveId = orderListVO.getServeId();
// 回收服务信息
- RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId)
- .eq(RecoveryServe::getIsDelete, 0).one();
+ RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId).one();
if (null != recoveryServe) {
orderListVO.setServePicture(recoveryServe.getCover());
}
--
Gitblit v1.7.1