借款

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

@@ -48,7 +48,7 @@ public class CarrierOwnerLoanRecordController {
         return Result.ok();
     }
 
-    @ApiOperation(value = "重新支付(只更改借款状态)",notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "借款重新支付(只更改借款状态)",notes = "<br>By:胡宇帆")
     @GetMapping("/ownerLoanRecordRetryPay")
     public Result<Object> ownerLoanRecordRetryPay(@RequestParam(value = "loanNo") @NotBlank String loanNo) {
         ownerLoanRecordService.ownerLoanRecordRetryPay(loanNo);

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

@@ -152,6 +152,44 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             ownerLoanRecord.setLoanType(param.getLoanType());
 
             if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
+                //ownerLoanRecord.setStatus()
+                fundPayProcess(param, ownerLoanRecord, borrower);
+            } else {
+                // 虚拟币 直接增加 更改状态审批通过
+                ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_PASS.getCode());
+                while (true) {
+                    OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
+                            ownerLoanRecord.getOwnerUserNo()).get();
+                    OwnerLoanAccount entity = new OwnerLoanAccount();
+                    entity.setId(ownerLoanAccount.getId());
+                    entity.setFundingAccountBalance(BigDecimal.ZERO);
+                    entity.setFundingFrozenBalance(BigDecimal.ZERO);
+                    entity.setFundingUsableBalance(BigDecimal.ZERO);
+                    entity.setVirtuallyAccountBalance(ownerLoanRecord.getLoanBalance());
+                    entity.setVirtuallyFrozenBalance(BigDecimal.ZERO);
+                    entity.setVirtuallyUsableBalance(ownerLoanRecord.getLoanBalance());
+                    entity.setModifiedTime(ownerLoanAccount.getModifiedTime());
+                    Integer flag = ownerLoanAccountDao.updateAccountCAS(entity, LocalDateTime.now(), true);
+                    if (flag == 1) {
+                        //生成借款流水
+                        initOwnerLoanRunningWaterRecord(ownerLoanRecord);
+                        //生成还款记录
+                        initOwnerRepayment(ownerLoanRecord);
+                        break;
+                    }
+                }
+            }
+
+        } else {
+            //拒绝
+            ownerLoanRecord.setLoanType(param.getLoanType());
+            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_REFUSE.getCode());
+        }
+        //更新借款记录
+        ownerLoanRecordDao.updateEntityByKey(ownerLoanRecord);
+    }
+
+    private void fundPayProcess(CarrierOwnerLoanRecordApproveParam param, OwnerLoanRecord ownerLoanRecord, Borrower borrower) {
         //资金
         BankTrade bankTrade = new BankTrade();
         if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(param.getPayChannel())) {
@@ -189,39 +227,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
 
         // 保存银行交易记录
         bankTradeDao.saveEntity(bankTrade);
-            } else {
-                // 虚拟币 直接增加 更改状态审批通过
-                ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_PASS.getCode());
-                while (true) {
-                    OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
-                            ownerLoanRecord.getOwnerUserNo()).get();
-                    OwnerLoanAccount entity = new OwnerLoanAccount();
-                    entity.setId(ownerLoanAccount.getId());
-                    entity.setFundingAccountBalance(BigDecimal.ZERO);
-                    entity.setFundingFrozenBalance(BigDecimal.ZERO);
-                    entity.setFundingUsableBalance(BigDecimal.ZERO);
-                    entity.setVirtuallyAccountBalance(ownerLoanRecord.getLoanBalance());
-                    entity.setVirtuallyFrozenBalance(BigDecimal.ZERO);
-                    entity.setVirtuallyUsableBalance(ownerLoanRecord.getLoanBalance());
-                    entity.setModifiedTime(ownerLoanAccount.getModifiedTime());
-                    Integer flag = ownerLoanAccountDao.updateAccountCAS(entity, LocalDateTime.now(), true);
-                    if (flag == 1) {
-                        //生成借款流水
-                        initOwnerLoanRunningWaterRecord(ownerLoanRecord);
-/*                        //生成还款记录
-                        initOwnerRepayment(ownerLoanRecord);*/
-                        break;
-                    }
-                }
-            }
-
-        } else {
-            //拒绝
-            ownerLoanRecord.setLoanType(param.getLoanType());
-            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_REFUSE.getCode());
-        }
-        //更新借款记录
-        ownerLoanRecordDao.updateEntityByKey(ownerLoanRecord);
     }