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

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanRecordDaoImpl.java

@@ -107,5 +107,10 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
         );
     }
 
+    @Override
+    public OwnerLoanRecord selectOneByLoanNo(Long loanNo) {
+        return baseMapper.selectOne(lQrWrapper().eq(OwnerLoanRecord::getLoanNo, loanNo));
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/dao/loan/OwnerLoanRecordDao.java

@@ -30,4 +30,5 @@ public interface OwnerLoanRecordDao extends BaseDao<OwnerLoanRecordMapper, Owner
 
     boolean updateStatusById(OwnerLoanRecord item);
 
+    OwnerLoanRecord selectOneByLoanNo(Long loanNo);
 }

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java

@@ -185,7 +185,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerLoanRecordApprove(CarrierOwnerLoanRecordApproveParam param) {
 
-        OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, param.getLoanNo()).get();
+        OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.selectOneByLoanNo(param.getLoanNo());
         if (!ownerLoanRecord.getStatus().equals(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode())) {
             log.info("当前借款单单号：{},状态：{}", ownerLoanRecord.getLoanNo(), ownerLoanRecord.getStatus());
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);