处理接单bug

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

@@ -9,6 +9,7 @@ import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
+import com.clx.performance.dao.loan.OrderChildLoanRetryRecordDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountRunningWaterRecordDao;
 import com.clx.performance.dao.loan.OwnerRepaymentDao;
@@ -27,6 +28,7 @@ import com.clx.performance.event.OwnerRepaymentUpdateEvent;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.model.loan.OrderChildLoanRetryRecord;
 import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.model.loan.OwnerLoanAccountRunningWaterRecord;
 import com.clx.performance.model.loan.OwnerRepayment;
@@ -78,7 +80,7 @@ public class OrderChildLoanComponent {
 
     private final ApplicationEventPublisher applicationEventPublisher;
 
-    private final SettlementDriverDetailDao settlementDriverDetailDao;
+    private final OrderChildLoanRetryRecordDao orderChildLoanRetryRecordDao;
 
     private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
 
@@ -172,9 +174,10 @@ public class OrderChildLoanComponent {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主已欠款");
         }
 
-        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.selectLoanFlag(orderGoods.getOrderNo());
-        if (settlementDriverDetail != null) {
-            log.info("当前订单存在未借款,未预付的司机计费,id{}", settlementDriverDetail.getId());
+        //SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.selectLoanFlag(orderGoods.getOrderNo());
+        List<OrderChildLoanRetryRecord> orderChildLoanRetryRecordList = orderChildLoanRetryRecordDao.listByField(OrderChildLoanRetryRecord::getOwnerUserNo, ownerInfoFeignVO.getUserNo());
+        if (CollectionUtil.isNotEmpty(orderChildLoanRetryRecordList)) {
+            log.info("当前货主存在未借款,未预付的司机计费,货主编号为{}", ownerInfoFeignVO.getUserNo());
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主货款不足");
         }
         //查询审批通过并且未用完的借款