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/CarrierOwnerPaymentController.java

@@ -37,7 +37,7 @@ public class CarrierOwnerPaymentController {
     }
 
     @ApiOperation(value = "付款详情",notes = "<br>By:刘海泉")
-    @PostMapping("/getOwnerPaymentDetail")
+    @GetMapping("/getOwnerPaymentDetail")
     @UnitCovert(param = false)
     public Result<CarrierOwnerPaymentVO> getOwnerPaymentDetail(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
         CarrierOwnerPaymentVO vo = ownerPaymentService.getOwnerPaymentDetail(id);
@@ -45,7 +45,7 @@ public class CarrierOwnerPaymentController {
     }
 
     @ApiOperation(value = "付款",notes = "<br>By:胡宇帆")
-    @PostMapping("/pay")
+    @GetMapping("/pay")
     @UnitCovert(param = false)
     public Result<Object> pay(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
         ownerPaymentService.pay(id);

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

@@ -709,6 +709,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             OwnerLoanRecord update = new OwnerLoanRecord();
             update.setId(ownerLoanRecord.getId());
             update.setLoanResidueBalance(balance);
+            update.setModifiedTime(ownerLoanRecord.getModifiedTime());
             Integer flag = ownerLoanRecordDao.updateCasLoanRecord(update);
             if (flag > 0) {
                 break;