From 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 09:07:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 2 +-
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java | 1 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 1 -
3 files changed, 2 insertions(+), 2 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 747f7ab..751c48b 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
@@ -480,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) {
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
index 63b88e7..68a3a4a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
@@ -181,7 +181,6 @@
public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
RecoveryServe serve = recoveryServeRequest.getServe();
serve.setId(recoveryServeRequest.getId());
- serve.setRecycleSubsidy(recoveryServeRequest.getRecycleSubsidy());
boolean update = recoveryServeService.updateById(serve);
// 城市及对应回收价
List<RecoveryServePrice> priceList = recoveryServePriceService.lambdaQuery()
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java
index 4c25a9e..2453bc5 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java
@@ -64,6 +64,7 @@
recoveryServe.setSort(getSort());
recoveryServe.setCover(getCover());
recoveryServe.setRotate(getRotate());
+ recoveryServe.setRecycleSubsidy(getRecycleSubsidy());
return recoveryServe;
}
--
Gitblit v1.7.1