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

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -41,6 +41,7 @@ public class EventListenerComponent {
         OrderChildLoanRetryRecord entity = new OrderChildLoanRetryRecord();
         entity.setSettlementOwnerId(settlementOwnerDetail.getId());
         entity.setSettlementDriverId(settlementDriverDetail.getId());
+        entity.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
         // 保存重试记录
         orderChildLoanRetryRecordDao.saveEntity(entity);
     }

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

@@ -382,7 +382,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
         Borrower borrower = borrowerDao.getEntityByKey(ownerLoanRecord.getBorrowerId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        if (Objects.equals(borrower.getDeleteStatus(), DeleteStatusEnum.NO.getCode())) {
+        if (Objects.equals(borrower.getDeleteStatus(), DeleteStatusEnum.YES.getCode())) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
         vo.setOrderPayWay(false);