承运与无车承运对接

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -3,6 +3,7 @@ package com.clx.performance.component;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.clx.order.enums.StatusEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
@@ -25,6 +26,7 @@ import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.event.OwnerLoanThawEvent;
 import com.clx.performance.event.OwnerRepaymentUpdateEvent;
+import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OwnerRunningWaterRecord;
@@ -89,6 +91,8 @@ public class OrderChildLoanComponent {
 
     private final  PaymentService paymentService;
 
+    private final OrderService orderService;
+
     /**
      * 接单校验判断
      *
@@ -201,6 +205,7 @@ public class OrderChildLoanComponent {
      */
     @Transactional(rollbackFor = Exception.class)
     public void childLoanConfirmAfterProcess(SettlementDriverDetail settlementDriverDetail, SettlementOwnerDetail settlementOwnerDetail, OrderChild orderChild) {
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementDriverDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
         log.info("1.运单确认收货后借款相关处理执行");
         //临时结算金额,借款抵扣后需要重新赋值结算金额为0,如果不需要借款相关逻辑,正常设置结算金额
@@ -224,6 +229,12 @@ public class OrderChildLoanComponent {
             log.info("3.当前是网运单,但预付运费不为0,说明已经处理");
             return;
         }
+
+        if (!Objects.equals(orderInfo.getSupportLoan(), StatusEnum.YES.getCode())){
+            log.info("3.2当前运单不支持货主借款");
+            return;
+        }
+
         Integer loanTypeFlag = null;
 
         String childNo = settlementDriverDetail.getChildNo();