Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -922,6 +922,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 // 发送mq 结算统计
                 settlementMqService.settlementStatistics(childNo, SettlementStatisticsMqParam.Type.SEPARATE.getCode());
             }
+
+            // 发送mq (运单更新)
+            orderChildBrokerMqService.orderChildUpdate(childNo);
         }
         else if (Objects.equals(settlementOrderChildRisk.getProcessMethod(), SettlementOrderChildRiskEnum.ProcessMethod.SYNC_RETRY.getCode())){
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOrderChildRiskServiceImpl.java

@@ -2,14 +2,17 @@ package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOrderChildRiskDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOrderChildRiskEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOrderChildRisk;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
@@ -48,6 +51,8 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
     @Autowired
     private SettlementOrderChildRiskDao settlementOrderChildRiskDao;
     @Autowired
+    private SettlementDriverDao settlementDriverDao;
+    @Autowired
     private SettlementOrderChildRiskStruct settlementOrderChildRiskStruct;
 
     @Autowired
@@ -68,6 +73,8 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(settlementOrderChildRisk.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(settlementOrderChildRisk.getChildNo()).orNull();
+
         settlementOrderChildRisk.setStatus(SettlementOrderChildRiskEnum.Status.PROCESSED.getCode());
         settlementOrderChildRisk.setProcessMethod(param.getProcessMethod());
         settlementOrderChildRisk.setProcessBy(loginUserInfo.getUserName());
@@ -90,6 +97,11 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
             settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+
+            if (settlementDriver != null) {
+                // 删除结算单
+                settlementDriverDao.deleteByKey(settlementDriver.getId());
+            }
         }
         else {