Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java

@@ -45,6 +45,7 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper,
                 .set(SettlementDriver::getInvoicingCompanyId, item.getInvoicingCompanyId())
                 .set(SettlementDriver::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
                 .set(SettlementDriver::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
+                .set(SettlementDriver::getPrepayFreightFlag, item.getPrepayFreightFlag())
         );
     }
 

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

@@ -1091,16 +1091,18 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
         if (settlementDriver != null) {
-            settlementDriver.setInvoiceType(settlementOwnerDetail.getInvoiceType());
-            settlementDriver.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
-            settlementDriver.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
-            settlementDriver.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
-            settlementDriverDao.updateInvoiceCompany(settlementDriver);
+            settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
         }
 
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
             // 网运单转普通单
             orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, settlementOwnerDetail.getInvoiceType(), null);
+
+            if (settlementDriver != null) {
+                settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
+                settlementDriverDao.updateInvoiceCompany(settlementDriver);
+            }
+
             return;
         }
 
@@ -1110,11 +1112,21 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             // 网运单转普通单
             orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, settlementOwnerDetail.getInvoiceType(), settlementOrderChildRisk.getRiskRemark());
 
+            if (settlementDriver != null) {
+                settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
+                settlementDriverDao.updateInvoiceCompany(settlementDriver);
+            }
+
             // 发送mq (更新无车承运)
             orderChildBrokerMqService.orderChildUpdate(childNo);
             return;
         }
 
+        if (settlementDriver != null) {
+            settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
+            settlementDriverDao.updateInvoiceCompany(settlementDriver);
+        }
+
         //普通单解冻
         applicationEventPublisher.publishEvent(new OwnerLoanThawEvent(this, childNo));
         // 发送mq 结算统计

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

@@ -96,10 +96,11 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
 
             if (settlementDriver != null) {
-                settlementDriver.setInvoiceType(settlementOwnerDetail.getInvoiceType());
-                settlementDriver.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
-                settlementDriver.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
-                settlementDriver.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
+                settlementDriver.setInvoiceType(settlementDriverDetail.getInvoiceType());
+                settlementDriver.setInvoicingCompanyId(settlementDriverDetail.getInvoicingCompanyId());
+                settlementDriver.setInvoicingCompanyShorterName(settlementDriverDetail.getInvoicingCompanyShorterName());
+                settlementDriver.setInvoicingCompanyGroupCode(settlementDriverDetail.getInvoicingCompanyGroupCode());
+                settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
                 settlementDriverDao.updateInvoiceCompany(settlementDriver);
             }
         }