From 562699fa6d0c279fe0f4f81ce87c336a34a3fb91 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 23 七月 2024 14:32:23 +0800
Subject: [PATCH] feat: 数据迁移;netty通信;bug修改
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
index d0c05bc..1e3a350 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
@@ -92,7 +92,7 @@
List<Integer> ids = orderList.stream().map(Order::getServeId).collect(Collectors.toList());
if (!ids.isEmpty()) {
List<RecoveryServe> serveList = recoveryServeService.lambdaQuery()
- .in(RecoveryServe::getId, ids).eq(RecoveryServe::getIsDelete, 0).list();
+ .in(RecoveryServe::getId, ids).list();
Map<Integer, String> map = serveList.stream().collect(Collectors.toMap(RecoveryServe::getId,
mw -> Optional.ofNullable(mw.getCover()).orElse("")));
for (Order order : orderList) {
@@ -134,7 +134,7 @@
changeDispatch.setWorkerName(masterWorker.getRealName());
changeDispatch.setApplyReason(reason);
changeDispatch.setApplyTime(DateUtils.getNowDate());
- changeDispatch.setState(0);
+ changeDispatch.setState(Constants.ZERO);
Boolean result = orderClient.changeOrderState(orderId, Constants.SIX).getData();
Order order = orderClient.detail(orderId).getData();
if (null == order) {
@@ -178,7 +178,7 @@
// 上传时判断是否在下单位置附件，距离大于某个值则 不允许上传
if (distance > Constants.THREE_THOUSAND) {
// throw new GlobalException("您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
- return R.fail(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
+ return R.ok(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
}
return R.ok(true);
}
@@ -245,7 +245,9 @@
Integer serveId = data.getOrderInfo().getServeId();
RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
.eq(RecoveryServe::getId, serveId).one();
- data.getOrderInfo().setCover(recoveryServe.getCover());
+ if (null != recoveryServe) {
+ data.getOrderInfo().setCover(recoveryServe.getCover());
+ }
return R.ok(data);
}
--
Gitblit v1.7.1