From 4abed7afa21b94e89f52bcd9a5a847792e3c4971 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Nov 2024 15:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=B4=E6=8A=A4=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E4=BF=A1=E6=81=AF=E8=A1=A5=E4=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IDistributionReservationClient.java |  6 ++++++
 .../feign/DistributionReservationClient.java  | 19 +++++++++++++++++++
 .../jobhandle/DistributionDatarepair.java     | 13 +++++++++++++
 3 files changed, 38 insertions(+)

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 a3b21c564..22a98fdf8 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
@@ -95,4 +95,10 @@ public interface IDistributionReservationClient {
 	@GetMapping(TOP+"/getRetentionMa")
 	String getRetentionMa();
 
+	/**
+	 * 维护预约信息
+	 * @param params
+	 * @return
+	 */
+    Boolean maintainReservationInfo(String params);
 }
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 c7ee97105..c675f46d2 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
@@ -17,6 +17,7 @@
 package com.logpm.distribution.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.dto.DistributionCancelReservationPackageDTO;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.service.IDistributionReservationService;
@@ -27,11 +28,13 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 预约列表 Feign实现类
@@ -98,5 +101,21 @@ public class DistributionReservationClient implements IDistributionReservationCl
 		return reservationService.retentionMa();
 	}
 
+	@Override
+	@Transactional
+	public Boolean maintainReservationInfo(String params) {
+		DistributionReservationEntity one = reservationService.getOne(Wrappers.<DistributionReservationEntity>query().lambda()
+			.eq(DistributionReservationEntity::getReservationCode, params)
+		);
+		if (Objects.isNull(one)){
+			reservationService.maintenanceReservationInfo(one.getId());
+			reservationService.maintenanceReservationInfo(one.getId());
+			return true;
+		}
+
+
+		return false;
+	}
+
 
 }
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
index 8206905e8..45abeb46b 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
@@ -318,4 +318,17 @@ public class DistributionDatarepair {
 	}
 
 
+	/**
+	 * 推送自提签收信息至工厂
+	 *
+	 * @return
+	 */
+	@XxlJob("sendFactorySignforInfo")
+	public ReturnT<String> maintainReservationInfo(String params) {
+		// 得到当前仓库所有的签收任务
+		Boolean b = distributionReservationClient.maintainReservationInfo(params);
+		return ReturnT.SUCCESS;
+	}
+
+
 }