Merge remote-tracking branch 'origin/v30.6_order_quote_20241022' into test_jdk17

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

@@ -147,16 +147,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
-        // 查询开票公司
-        InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
-                orderChild.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
         // 开票服务率
         settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
-        if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
-            settlementOwnerDetail.setInvoiceServiceFeeRate(
-                    invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
-        }
 
         // 开票服务费
         settlementOwnerDetail.setInvoiceServiceFee(
@@ -178,6 +170,13 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
             settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+            // 设置开票服务率
+            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
+                    orderChild.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+            if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
+                settlementOwnerDetail.setInvoiceServiceFeeRate(
+                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
+            }
         }
 
         // 结算金额