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

@@ -732,8 +732,14 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             log.info("宁波银行响应当前业务，不能取消{}", JSONUtil.parse(result));
             throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_RECORD_CANCEL_STATUS_ERROR);
         }
+        if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(ownerLoanRecord.getLoanType())) {
             log.info("借款记录取消，更新状态为待审批");
             ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
+        } else {
+            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAY_WAIT.getCode());
+
+        }
+
         ownerLoanRecordDao.updateStatusById(ownerLoanRecord);
 
         if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(ownerLoanRecord.getPayChannel())) {

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -40,7 +40,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
     @Autowired
     private NbBankRecordDao nbBankRecordDao;
 
-    @PostConstruct
+    //@PostConstruct
     public void bankInit() throws IOException {
         File file = new File("/app/nbbank");
         file.mkdir();