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

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -31,6 +31,7 @@ public class BrokerServiceImpl implements BrokerService {
             log.info("运单同步网络货运失败, msg:{}", result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());
         }
+        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
     }
     @Override
     public TransportVO getOrderChildStatus(String childNo) {
@@ -39,6 +40,7 @@ public class BrokerServiceImpl implements BrokerService {
         if (result.getCode() != 0) {
             log.info("运单同步网络货运失败, msg:{}", result.getMsg());
         }
+        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
 
         return result.getData();
     }

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -223,8 +223,6 @@ public class OrderChildSyncTransportListener {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
             // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
-            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
-
             InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
                     settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
             //设置开票公司信息
@@ -233,7 +231,7 @@ public class OrderChildSyncTransportListener {
             settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
 
             settlementOwnerDetail.setInvoiceServiceFeeRate(
-                    invoiceCompany.getServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
+                    invoiceCompany.getServiceFeeRate()==null? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
 
             settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());

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

@@ -108,7 +108,8 @@ public class SettlementServiceImpl implements SettlementService {
             settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
             settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
-            settlementOwnerDetail.setInvoiceServiceFeeRate(invoiceCompany.getServiceFeeRate());
+            settlementOwnerDetail.setInvoiceServiceFeeRate(
+                    invoiceCompany.getServiceFeeRate()==null? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
 
             settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());