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

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

@@ -276,6 +276,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
         }
         // 更新借款支付信息
+        ownerLoanRecord.setPayChannel(param.getPayChannel());
         ownerLoanRecordDao.updatePay(ownerLoanRecord);
 
         bankTrade.setRelationNo(ownerLoanRecord.getLoanNo().toString());
@@ -671,7 +672,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_RECORD_CANCEL_STATUS_ERROR);
         }
 
-        NbBankOrderResultVO result = bankService.getResult(loanNo);
+        NbBankOrderResultVO result = bankService.getResult(ownerLoanRecord.getMerchantRunningWaterNo());
         Integer status = result.getStatus();
 
         if (!NbBankStatusEnum.Status.INIT.getCode().equals(status)