From ce3fdeb02da6c0b9b1928702a4dafb0af5633604 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 29 Oct 2024 20:33:02 +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    | 26 ++++++++++
 .../mapper/WarehouseMappingDataMapper.java    | 16 ++++++
 .../mapper/WarehouseMappingDataMapper.xml     | 50 +++++++++++++++++++
 .../service/IWarehouseMappingDataService.java | 10 ++++
 .../impl/WarehouseMappingDataServiceImpl.java | 27 ++++++++++
 5 files changed, 129 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 dd2235042..87e552b87 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
@@ -1042,4 +1042,30 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("dealWaybillPayType")
+	public ReturnT<String>  dealWaybillPayType(String param) {
+		log.info("############dealWaybillPayType: 处理运单支付类型为月结   开始");
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllDealWithWaybillNo();
+
+		ls.forEach(json -> {
+
+			Integer id = json.getInt("id");
+			String waybillNo = json.getStr("waybillNo");
+
+			warehouseMappingDataService.deleteStatisticsdata(waybillNo);
+
+
+			warehouseMappingDataService.updateStatusDealwithWaybillById(id);
+
+		});
+
+
+		log.info("############dealWaybillPayType: 处理运单支付类型为月结  完成");
+
+		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 d927da696..cb423789e 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
@@ -148,5 +148,21 @@ public interface WarehouseMappingDataMapper {
 	void updateRepairParcelListWaybillById(@Param("id") Integer id, @Param("status") int status);
 
     void updatePackageStatusList(@Param("orderPackageCodes") List<String> orderPackageCodes, @Param("warehouseId") Long warehouseId, @Param("packageStatus") String packageStatus);
+
+    List<JSONObject> findAllDealWithWaybillNo();
+
+	void updateStatusDealwithWaybillById(@Param("id") Integer id);
+
+	void udpateWaybillPayWay(@Param("waybillNo") String waybillNo, @Param("payWay") String payWay);
+
+	void deletedTrunklinePackageByWaybillNo(@Param("waybillNo") String waybillNo);
+
+	void deletedWarehousePackageByWaybillNo(@Param("waybillNo") String waybillNo);
+
+	void deletedDistributionPackageByWaybillNo(@Param("waybillNo") String waybillNo);
+
+	void deletedOrderByWaybillNo(@Param("waybillNo") String waybillNo);
+
+	void deletedBalanceOrderByWaybillNo(@Param("waybillNo") String waybillNo);
 }
 
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 cdb723643..6f50a258c 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
@@ -504,4 +504,54 @@
         where ldpl.warehouse_id = #{warehouseId}
     </update>
 
+
+    <select id="findAllDealWithWaybillNo" resultType="cn.hutool.json.JSONObject">
+        select id id,
+               waybill_no waybillNo,
+               status status
+        from deal_with_waybill_pay_type
+        where status = 0
+    </select>
+
+    <update id="updateStatusDealwithWaybillById">
+        update deal_with_waybill_pay_type
+        set status = 1
+        where id = #{id}
+    </update>
+
+    <update id="udpateWaybillPayWay">
+        update logpm_warehouse_waybill
+        set pay_way = #{payWay},
+            check_status = 1
+        where waybill_no = #{waybillNo}
+
+    </update>
+
+    <delete id="deletedTrunklinePackageByWaybillNo">
+        delete from logpm_statistics_trunkline_package
+        where waybill_no = #{waybillNo}
+    </delete>
+
+    <delete id="deletedWarehousePackageByWaybillNo">
+        delete from logpm_statistics_warehouse_package
+        where waybill_no = #{waybillNo}
+    </delete>
+
+
+    <delete id="deletedDistributionPackageByWaybillNo">
+        delete from logpm_statistics_distribution_package
+        where waybill_no = #{waybillNo}
+    </delete>
+
+    <delete id="deletedOrderByWaybillNo">
+        delete from logpm_statistics_order_info
+        where waybill_no = #{waybillNo}
+    </delete>
+
+    <delete id="deletedBalanceOrderByWaybillNo">
+        delete from logpm_statistics_balance_order_info
+        where waybill_no = #{waybillNo}
+    </delete>
+
+
 </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 4e75daf17..1c00269b6 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
@@ -129,4 +129,14 @@ public interface IWarehouseMappingDataService {
 	void updateRepairParcelListWaybillById(Integer id, int status);
 
 	void updatePackageStatusList(List<String> orderPackageCodes, Long warehouseId, String packageStatus);
+
+    List<JSONObject> findAllDealWithWaybillNo();
+
+
+	void updateStatusDealwithWaybillById(Integer id);
+
+	void deleteStatisticsdata(String waybillNo);
+
+
+
 }
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 a5991c919..82dc78361 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
@@ -311,4 +311,31 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
 
 		warehouseMappingDataMapper.updatePackageStatusList(orderPackageCodes,warehouseId,packageStatus);
 	}
+
+	@Override
+	public List<JSONObject> findAllDealWithWaybillNo() {
+		return warehouseMappingDataMapper.findAllDealWithWaybillNo();
+	}
+
+	@Override
+	public void updateStatusDealwithWaybillById(Integer id) {
+		warehouseMappingDataMapper.updateStatusDealwithWaybillById(id);
+	}
+
+	@Override
+	public void deleteStatisticsdata(String waybillNo) {
+
+		warehouseMappingDataMapper.udpateWaybillPayWay(waybillNo,"3");
+
+		warehouseMappingDataMapper.deletedTrunklinePackageByWaybillNo(waybillNo);
+
+		warehouseMappingDataMapper.deletedWarehousePackageByWaybillNo(waybillNo);
+
+		warehouseMappingDataMapper.deletedDistributionPackageByWaybillNo(waybillNo);
+
+		warehouseMappingDataMapper.deletedOrderByWaybillNo(waybillNo);
+
+		warehouseMappingDataMapper.deletedBalanceOrderByWaybillNo(waybillNo);
+
+	}
 }