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

performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierOwnerLoanRecordController.java

@@ -124,12 +124,12 @@ public class CarrierOwnerLoanRecordController {
 //        return Result.ok();
 //    }
 
-    @ApiOperation(value = "借款支付取消",notes = "<br>By:艾庆国")
+/*    @ApiOperation(value = "借款支付取消",notes = "<br>By:艾庆国")
     @PostMapping("/updateOwnerLoanRecordPayCancel")
     public Result<Object> updateOwnerLoanRecordPayCancel(@RequestBody @Validated CarrierOwnerLoanRecordPayCancelParam param) {
         ownerLoanRecordService.updateOwnerLoanRecordPayCancel(param);
         return Result.ok();
-    }
+    }*/
 
     @ApiOperation(value = "转账支付-借款短信", notes = "<br>By:姜文业")
     @GetMapping("/sendLoanSms")

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

@@ -688,7 +688,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         BankTrade bankTrade = bankTradeDao.selectByRelationNo(loanNo).get();
         Integer tradeType = bankTrade.getTradeType();
         // 调用宁波退款
-        bankService.refund(tradeType, bankTrade.getMerchantRunningWaterNo(), Integer.valueOf(ownerLoanRecord.getLoanBalance().movePointRight(2).toString()), bankTrade.getRunningWaterOpenNo());
+        bankService.refund(tradeType, bankTrade.getMerchantRunningWaterNo(), Integer.parseInt(ownerLoanRecord.getLoanBalance().toString()), bankTrade.getRunningWaterOpenNo());
 
     }