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

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

@@ -483,15 +483,15 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
 //            // 转普通单
 //            settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
-            settlementOwnerDetail.setInvoicingCompanyId(null);
-            settlementOwnerDetail.setInvoicingCompanyShorterName(null);
-            settlementOwnerDetail.setInvoicingCompanyGroupCode(null);
+//            settlementOwnerDetail.setInvoicingCompanyId(null);
+//            settlementOwnerDetail.setInvoicingCompanyShorterName(null);
+//            settlementOwnerDetail.setInvoicingCompanyGroupCode(null);
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
 
-            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());
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
 
             settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);