订单报价-同步网络货运-1

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

@@ -142,6 +142,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;
         }
@@ -156,7 +160,7 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         try{
             // 更新broker
             orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail,
-                    settlementDriverDetail, settlementDriver, null);
+                    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

@@ -303,7 +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.);
+        // 开票票配置
+        orderChildInfo.setInvoiceNeed(quotationDetailVO.getInvoiceConfigType());
+        // 预估运费单价
+        orderChildInfo.setPredictFreightPrice(quotationDetailVO.getForecastFreightQuotation().intValue());
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);