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

@@ -85,7 +85,7 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
         return update(lUdWrapper()
                 .eq(OwnerLoanRecord::getId, item.getId())
                 .set(OwnerLoanRecord::getStatus, item.getStatus())
-
+                .set(OwnerLoanRecord::getPayChannel, item.getPayChannel())
                 .set(OwnerLoanRecord::getRunningWaterOpenNo, item.getRunningWaterOpenNo())
                 .set(OwnerLoanRecord::getMerchantRunningWaterNo, item.getMerchantRunningWaterNo())
                 .set(OwnerLoanRecord::getRemittanceIdentificationCode, item.getRemittanceIdentificationCode())

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

@@ -675,8 +675,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         NbBankOrderResultVO result = bankService.getResult(ownerLoanRecord.getMerchantRunningWaterNo());
         Integer status = result.getStatus();
 
-        if (!NbBankStatusEnum.Status.INIT.getCode().equals(status)
-                && !NbBankStatusEnum.Status.FAIL.getCode().equals(status)
+        if (!NbBankStatusEnum.Status.FAIL.getCode().equals(status)
                 && !NbBankStatusEnum.Status.NOT_FOUND.getCode().equals(status)
         ) {
             log.info("宁波银行响应当前业务，不能取消{}", JSONUtil.parse(result));