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

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

 package com.clx.performance.service.broker;
 
+import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriver;
@@ -9,9 +10,10 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 public interface OrderChildBrokerService {
 
     void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                        SettlementDriverDetail settlementDriverDetail);
+                        SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO);
     void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                        SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver);
+                        SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
+                          OwnerQuotationDetailVO quotationDetailVO);
 
     void orderChildDriverPay(SettlementDriverDetail settlementDriverDetail);
 

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

 package com.clx.performance.service.impl.broker;
 
+import com.clx.order.feign.OrderFeign;
+import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;
@@ -10,6 +12,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementDriverDetailEnum;
 import com.clx.performance.enums.settle.SettlementOrderChildRiskEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
+import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriver;
@@ -59,6 +62,9 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
     @Autowired
     private SettlementPostService settlementPostService;
 
+    @Autowired
+    private QuotationService quotationService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void orderChildSync(BrokerOrderChildSyncMqParam mq) {
@@ -106,13 +112,17 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        // 获取最新订单报价数据
+        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
+                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
         // 更新状态
         settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
         settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
         try{
             // 同步broker
-            orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+            orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail, quotationDetailVO);
         } catch (Exception e) {
             log.info("同步无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
         }
@@ -134,6 +144,10 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         SettlementDriver settlementDriver = settlementDriverDao
                 .getByChildNo(orderChild.getChildNo()).orNull();
 
+        // 获取最新订单报价数据
+        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
+                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
             return;
         }
@@ -148,7 +162,7 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         try{
             // 更新broker
             orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail,
-                    settlementDriverDetail, settlementDriver);
+                    settlementDriverDetail, settlementDriver, quotationDetailVO);
         } catch (Exception e) {
             log.info("更新无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
         }

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

@@ -5,6 +5,7 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 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;
@@ -67,19 +68,20 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
     @Override
     public void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                               SettlementDriverDetail settlementDriverDetail) {
+                               SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO) {
 
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
-                settlementDriverDetail, null);
+                settlementDriverDetail, null, quotationDetailVO);
 
         brokerService.orderChildSync(transportParam);
     }
 
     @Override
     public void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                                 SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver) {
+                                 SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
+                                 OwnerQuotationDetailVO quotationDetailVO) {
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
-                settlementDriverDetail, settlementDriver);
+                settlementDriverDetail, settlementDriver, quotationDetailVO);
 
         // 运单更新
         brokerService.orderChildUpdate(transportParam);
@@ -93,7 +95,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
     }
 
     private TransportParam buildParam(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
-                                   SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver){
+                                   SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
+                                      OwnerQuotationDetailVO quotationDetailVO){
         String host = documentFeign.getHost().getData();
 
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
@@ -300,6 +303,10 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
                 SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())? 1 : 0);
         orderChildInfo.setSettleStatus(settlementDriver!=null
                 && Objects.equals(settlementDriver.getStatus(), SettlementDriverEnum.Status.SETTLED.getCode())? 1 : 0);
+        // 开票票配置
+        orderChildInfo.setInvoiceNeed(quotationDetailVO.getInvoiceConfigType());
+        // 预估运费单价
+        orderChildInfo.setPredictFreightPrice(quotationDetailVO.getForecastFreightQuotation().intValue());
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);

performance-api/src/main/java/com/clx/performance/vo/pc/broker/OpenOrderChildDTO.java

@@ -82,4 +82,10 @@ public class OpenOrderChildDTO {
     @Schema(description = "结算状态 1 已结算 ", example = "1234124")
     private Integer settleStatus;
 
+    @Schema(description = "是否需要开票配置 0:否 1:是", example = "1", required = true)
+    private Integer invoiceNeed;
+
+    @Schema(description = "预估运费单价（分/吨）", example = "162", required = true)
+    private Integer predictFreightPrice;
+
 }