Merge branch 'v30.6_order_quote_20241022' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java

 package com.clx.performance.service.impl.broker;
 
+import com.clx.order.enums.QuotationEnum;
 import com.clx.order.feign.AddressFeign;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
@@ -8,7 +9,6 @@ import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.PowerTypeEnum;
 import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
@@ -118,11 +118,16 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
         TruckInfoFeignVo truckInfoFeignVo = truckFeign.getTruckInfoWithTransport(orderChild.getTruckId()).getData();
 
-        InvoicingCompanyVO invoicingCompanyByGroupCode = invoicingCompanyService.getInvoicingCompanyByGroupCode(orderChild.getInvoicingCompanyGroupCode());
-
         // 参数组装
         TransportParam transportParam = new TransportParam();
-        transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
+
+        // 若有开票配置，且开票配置为是，则使用开票配置的平台编码
+        if (Objects.nonNull(quotationDetailVO) && Objects.nonNull(quotationDetailVO.getInvoiceConfigType())
+                && Objects.equals(quotationDetailVO.getInvoiceConfigType(), QuotationEnum.InvoicingConfigType.YES.getCode())) {
+            InvoicingCompanyVO invoicingCompanyByGroupCode = invoicingCompanyService.getInvoicingCompanyByGroupCode(orderChild.getInvoicingCompanyGroupCode());
+            transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
+        }
+
         transportParam.setOrderCode(orderChild.getChildNo());
         transportParam.setOwnerMobile(ownerMobile);