1.干线bug修复

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;
+	}
+
+
+
 }

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);
 }
 

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>

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);
+
+
+
 }

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);
+
+	}
 }