Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

 package com.clx.performance.service.impl.settle;
 
 import cn.hutool.json.JSONUtil;
+import com.clx.order.enums.InvoicingCompanyEnum;
 import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.SettlementConfig;
@@ -108,8 +109,12 @@ public class SettlementServiceImpl implements SettlementService {
             settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
             settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
-            settlementOwnerDetail.setInvoiceServiceFeeRate(
-                    invoiceCompany.getServiceFeeRate()==null? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
+
+            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
+            if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
+                settlementOwnerDetail.setInvoiceServiceFeeRate(
+                        invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
+            }
 
             settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());