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

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

@@ -41,6 +41,7 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper,
     public boolean updateInvoiceCompany(SettlementDriver item) {
         return update(lUdWrapper()
                 .eq(SettlementDriver::getId, item.getId())
+                .set(SettlementDriver::getInvoiceType, item.getInvoiceType())
                 .set(SettlementDriver::getInvoicingCompanyId, item.getInvoicingCompanyId())
                 .set(SettlementDriver::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
                 .set(SettlementDriver::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())

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

@@ -1091,6 +1091,7 @@ 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());

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

@@ -94,6 +94,14 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
             settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+
+            if (settlementDriver != null) {
+                settlementDriver.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+                settlementDriver.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
+                settlementDriver.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
+                settlementDriver.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
+                settlementDriverDao.updateInvoiceCompany(settlementDriver);
+            }
         }
         else {
             // 状态回滚