From 6da28a0d332e8ddcd61ff9f5d7428b0afc6db284 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 20 Dec 2024 14:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=BA=93=E5=B9=BF=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/feign/IDistributionReservationClient.java    | 4 ++--
 .../distribution/feign/DistributionReservationClient.java     | 4 ++--
 .../distribution/service/IDistributionNodeWorkService.java    | 2 +-
 .../service/impl/DistributionNodeWorkServiceImpl.java         | 2 +-
 .../service/impl/WarehouseRetentionScanServiceImpl.java       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java
index 100fb93f0..e51bc2e79 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java
@@ -112,6 +112,6 @@ public interface IDistributionReservationClient {
 	 * @param nodeFanoutMsg
 	 * @param user
 	 */
-	@PostMapping(TOP+"/maintainReservationInfo")
-	void planRetention(@RequestBody NodeFanoutMsg<ReservationVO> nodeFanoutMsg,@RequestBody BladeUser user);
+	@PostMapping(TOP+"/planRetention")
+	void planRetention(@RequestBody NodeFanoutMsg<ReservationVO> nodeFanoutMsg);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java
index 2f08d3bd1..19e64ebc8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java
@@ -122,8 +122,8 @@ public class DistributionReservationClient implements IDistributionReservationCl
 	}
 
 	@Override
-	public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
-		distributionNodeWorkService.planRetention(nodeFanoutMsg,user);
+	public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg) {
+		distributionNodeWorkService.planRetention(nodeFanoutMsg);
 	}
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
index 8014b515c..db2c816e1 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
@@ -30,7 +30,7 @@ public interface IDistributionNodeWorkService {
 	 * @param nodeFanoutMsg
 	 * @param user
 	 */
-	void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user);
+	void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg);
 
 	/**
 	 * 取消预约
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
index 4f4474126..e23426cc8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
@@ -64,7 +64,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 	}
 
 	@Override
-	public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) {
+	public void planRetention(NodeFanoutMsg<ReservationVO> nodeFanoutMsg) {
 		try {
 			if (distributionProperties.getSendFanoutMsg()) {
 				rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryRetention.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java
index 0c9f2575f..2487d190d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java
@@ -175,7 +175,7 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
 		redis.setEx(AuthUtil.getTenantId() + ":warehouse:" + warehouseRetentionScan.getWarehouseId() + ":orderPackageCode:" + warehouseRetentionScan.getOrderPackageCode()+ ":retentionSave:",warehouseRetentionScan.getTaskCode(),60L*3L);
 		distributionSignforClient.updateIsHaveAbnormalPackage(warehouseRetentionScan.getReservationId());
 		NodeFanoutMsg<ReservationVO> nodeFanoutMsg = buildNodeFanoutMsgByRestention(warehouseRetentionScan.getReservationId(),warehouseRetentionScan);
-		reservationClient.planRetention(nodeFanoutMsg,AuthUtil.getUser());
+		reservationClient.planRetention(nodeFanoutMsg);
 		return R.success("操作成功");
 	}