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

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

@@ -496,32 +496,27 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
             settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);
             settlementDriverDetailDao.updatePreFreight(settlementDriverDetail);
+        }
 
-            // 发送mq (更新无车承运)
-            orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
-
-        } else {
-
-            if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
-                // 转普通单
-                settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
-                settlementOwnerDetail.setInvoicingCompanyId(null);
-                settlementOwnerDetail.setInvoicingCompanyShorterName(null);
-                settlementOwnerDetail.setInvoicingCompanyGroupCode(null);
+        if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
+            // 转普通单
+            settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
+            settlementOwnerDetail.setInvoicingCompanyId(null);
+            settlementOwnerDetail.setInvoicingCompanyShorterName(null);
+            settlementOwnerDetail.setInvoicingCompanyGroupCode(null);
 
-                settlementDriverDetail.setInvoiceType(settlementOwnerDetail.getInvoiceType());
-                settlementDriverDetail.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
-                settlementDriverDetail.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
-                settlementDriverDetail.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
+            settlementDriverDetail.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+            settlementDriverDetail.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
+            settlementDriverDetail.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
+            settlementDriverDetail.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
 
-                settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);
-                settlementDriverDetailDao.updatePreFreight(settlementDriverDetail);
+            settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);
+            settlementDriverDetailDao.updatePreFreight(settlementDriverDetail);
 
-            }
-            else {
-                // 发送mq (更新无车承运)
-                orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
-            }
+        }
+        else {
+            // 发送mq (更新无车承运)
+            orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
         }
 
 //