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

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

@@ -147,6 +147,11 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
+        //设置开票公司信息
+        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
         // 查询开票公司
         InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
                 settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -171,10 +176,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                 settlementCommonService.settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
-        //设置开票公司信息
-        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
-        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
-        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
         settlementOwnerDetail.setReportFlag(orderChild.getReportFlag());
 
         settlementOwnerDetail.setInvoiceChannel(SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode());