From 7a6a0f753b4b56ed4aa1a97da679ac3657aa5039 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 18 Oct 2024 16:22:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobhandle/SyncOrderInfoToPlatform.java    | 38 +++++++++++++++++++
 .../mapper/WarehouseMappingDataMapper.java    |  4 ++
 .../mapper/WarehouseMappingDataMapper.xml     | 13 +++++++
 .../service/IWarehouseMappingDataService.java |  4 ++
 .../impl/WarehouseMappingDataServiceImpl.java | 10 +++++
 5 files changed, 69 insertions(+)

diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
index 09057c645..6a2ecffbf 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
@@ -876,5 +876,43 @@ public class SyncOrderInfoToPlatform {
 		return ReturnT.SUCCESS;
 	}
 
+	@XxlJob("syncWaybillOrderInfo")
+	public ReturnT<String>  syncWaybillOrderInfo(String param) {
+		log.info("############syncWaybillOrderInfo: 同步运单下订单信息  开始");
+		List<JSONObject> waybillJSONs = warehouseMappingDataService.findSyncWaybillOrderInfo();
+
+		if(StringUtil.isBlank(param)){
+			log.warn("###########syncWaybillOrderInfo: 仓库id为空");
+			throw new CustomerException(405,"仓库id为空");
+		}
+
+		Long warehouseId = Long.parseLong(param);
+
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("###########syncWaybillOrderInfo: 仓库信息为空");
+			throw new CustomerException(405,"仓库信息为空");
+		}
+
+		Integer oldId = warehouseEntity.getOldId();
+
+
+		waybillJSONs.forEach(waybillJSON -> {
+
+			Integer id = waybillJSON.getInt("id");
+			String waybillNo = waybillJSON.getStr("waybillNo");
+
+			List<String> list = advanceClient.findListByWaybillNo(waybillNo);
+
+			syncOrderInfoService.handleData(list,oldId,warehouseId,null,null);
+
+			warehouseMappingDataService.updateSyncWaybillOrderRecordById(id,1);
+		});
+
+		log.info("############syncWaybillOrderInfo: 同步运单信息  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
 
 }
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
index 65c6f5d66..681884fdf 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
@@ -134,5 +134,9 @@ public interface WarehouseMappingDataMapper {
 	List<JSONObject> findAllWaybillNo();
 
 	void updateStatusById(@Param("id") Long id, @Param("status") int status);
+
+    List<JSONObject> findSyncWaybillOrderInfo();
+
+	void updateSyncWaybillOrderRecordById(@Param("id") Integer id, @Param("status") int status);
 }
 
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
index d0df3b2b6..28ecd7a2c 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
@@ -437,5 +437,18 @@
         where id = #{id}
     </update>
 
+    <select id="findSyncWaybillOrderInfo" resultType="cn.hutool.json.JSONObject">
+        select id id,
+               waybill_no waybillNo,
+               status status
+        from sync_waybill_order_record
+        where status = 0
+    </select>
+
+    <update id="updateSyncWaybillOrderRecordById">
+        update sync_waybill_order_record
+        set status = #{status}
+        where id = #{id}
+    </update>
 
 </mapper>
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
index 3e10832c6..a0525a212 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
@@ -115,4 +115,8 @@ public interface IWarehouseMappingDataService {
 	List<JSONObject> findAllWaybillNo();
 
 	void updateStatusById(Long id, int status);
+
+    List<JSONObject> findSyncWaybillOrderInfo();
+
+	void updateSyncWaybillOrderRecordById(Integer id, int status);
 }
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
index bfa136608..36712be59 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
@@ -275,4 +275,14 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
 	public void updateStatusById(Long id, int status) {
 		warehouseMappingDataMapper.updateStatusById(id,status);
 	}
+
+	@Override
+	public List<JSONObject> findSyncWaybillOrderInfo() {
+		return warehouseMappingDataMapper.findSyncWaybillOrderInfo();
+	}
+
+	@Override
+	public void updateSyncWaybillOrderRecordById(Integer id, int status) {
+		warehouseMappingDataMapper.updateSyncWaybillOrderRecordById(id,status);
+	}
 }