Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

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

@@ -12,6 +12,7 @@ import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountRunningWaterRecordDao;
 import com.clx.performance.dao.loan.OwnerRepaymentDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dto.LoanBalanceDTO;
 import com.clx.performance.enums.OrderGoodsOverWeightEnum;
 import com.clx.performance.enums.OwnerAccountEnum;
@@ -76,6 +77,8 @@ public class OrderChildLoanComponent {
 
     private final ApplicationEventPublisher applicationEventPublisher;
 
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
+
 
 
     /**
@@ -166,6 +169,11 @@ 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());
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主已欠款");
+        }
         //查询审批通过并且未用完的借款
         LoanBalanceDTO param = new LoanBalanceDTO();
         param.setOrderChildPrice(orderChildPrice);

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
+import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
@@ -91,4 +92,12 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
         );
     }
 
+    @Override
+    public SettlementDriverDetail selectLoanFlag(String orderNo) {
+        return baseMapper.selectOne(lQrWrapper().eq(SettlementDriverDetail::getOrderNo, orderNo)
+                .eq(SettlementDriverDetail::getLoanFlag, OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode())
+                .eq(SettlementDriverDetail::getPrepayFreightFlag, SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode())
+        );
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

@@ -33,4 +33,6 @@ public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetai
     List<SettlementDriverDetail> findByDriverSettlementIds(List<Integer> ids);
 
     void updateLoanFlagByChildNoList(Set<String> childNoList);
+
+    SettlementDriverDetail selectLoanFlag(String orderNo);
 }