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

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -387,7 +387,7 @@ public class OrderChildLoanComponent {
         try {
             lock = redissonClient.getLock(RedissonConstants.ORDER_CHILD_LOAN_OWNER_USERID_LOCK + dto.getOwnerUserNo());
 
-            boolean flag = lock.tryLock(15, 30, TimeUnit.SECONDS);
+            boolean flag = lock.tryLock(3, 5, TimeUnit.SECONDS);
             if (!flag) {
                 throw new ServiceSystemException(PerformanceResultEnum.GET_LOAN_RECORD);
             }

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/model/loan/OwnerLoanRecord.java

@@ -69,11 +69,11 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     private BigDecimal loanResidueBalance;
 
     @TableField("borrower_id")
-    @ApiModelProperty("借款方Id")
+    @ApiModelProperty("借出方Id")
     private Integer borrowerId;
 
     @TableField("borrower")
-    @ApiModelProperty("借款方")
+    @ApiModelProperty("借出方")
     private String borrower;
 
     @ApiModelProperty("借款方账户")
@@ -90,7 +90,7 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     private String lendingParty;
 
     @TableField("lending_party_account")
-    @ApiModelProperty("借出方账户")
+    @ApiModelProperty("借款方账户")
     private String lendingPartyAccount;
 
     @TableField("payee")

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

@@ -128,9 +128,13 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         entity.setOwnerUserName(loginUserInfo.getUserName());
         entity.setMobile(loginUserInfo.getUserMobile());
         entity.setLoanBalance(param.getLoanBalance());
+
+        entity.setBorrowerId(param.getBorrowerId());
         entity.setBorrower(param.getBorrower());
-        entity.setBorrowerAccount(ownerBindCardRecord.getBankCardNumber());
+
         entity.setLendingParty(param.getLendingParty());
+        entity.setLendingPartyAccount(ownerBindCardRecord.getBankCardNumber());
+
         entity.setPayee(param.getPayee());
         entity.setPayeeAccount(param.getPayeeAccount());
         entity.setCreateBy(loginUserInfo.getUserName());
@@ -152,43 +156,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             ownerLoanRecord.setLoanType(param.getLoanType());
 
             if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
-                //资金
-                BankTrade bankTrade = new BankTrade();
-                if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(param.getPayChannel())) {
-                    // 订单支付
-                    NbBankOrderPayResultVO orderPayResultVO = bankService.orderDirectPay(param.getLoanNo(),
-                            ownerLoanRecord.getLoanBalance().intValue(), borrower.getOpenBankId(), borrower.getBankCardNo(), borrower.getName());
-                    ownerLoanRecord.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
-                    ownerLoanRecord.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
-                    ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
-                    ownerLoanRecord.setLoanResidueBalance(ownerLoanRecord.getLoanBalance());
-
-                    ownerLoanRecord.setLendingParty(borrower.getName());
-                    ownerLoanRecord.setLendingPartyAccount(borrower.getBankCardNo());
-
-                    bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_DIRECT_PAY.getCode());
-                } else {
-                    // 转账支付
-                    NbBankOrderPayResultVO orderPayResultVO = bankService.orderTransferPay(ownerLoanRecord.getLoanBalance().intValue());
-                    ownerLoanRecord.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
-                    ownerLoanRecord.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
-                    ownerLoanRecord.setRemittanceIdentificationCode(orderPayResultVO.getSignNo());
-                    ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
-                    ownerLoanRecord.setLoanResidueBalance(ownerLoanRecord.getLoanBalance());
-
-                    bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
-                }
-                // 更新借款支付信息
-                ownerLoanRecordDao.updatePay(ownerLoanRecord);
-
-                bankTrade.setRelationNo(ownerLoanRecord.getLoanNo().toString());
-                bankTrade.setOrderType(BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode());
-                bankTrade.setAmount(ownerLoanRecord.getLoanBalance());
-                bankTrade.setMerchantRunningWaterNo(ownerLoanRecord.getMerchantRunningWaterNo());
-                bankTrade.setRunningWaterOpenNo(ownerLoanRecord.getRunningWaterOpenNo());
-
-                // 保存银行交易记录
-                bankTradeDao.saveEntity(bankTrade);
+                //ownerLoanRecord.setStatus()
+                fundPayProcess(param, ownerLoanRecord, borrower);
             } else {
                 // 虚拟币 直接增加 更改状态审批通过
                 ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_PASS.getCode());
@@ -208,8 +177,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
                     if (flag == 1) {
                         //生成借款流水
                         initOwnerLoanRunningWaterRecord(ownerLoanRecord);
-/*                        //生成还款记录
-                        initOwnerRepayment(ownerLoanRecord);*/
+                        //生成还款记录
+                        initOwnerRepayment(ownerLoanRecord);
                         break;
                     }
                 }
@@ -224,6 +193,46 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         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())) {
+            // 订单支付
+            NbBankOrderPayResultVO orderPayResultVO = bankService.orderDirectPay(param.getLoanNo(),
+                    ownerLoanRecord.getLoanBalance().intValue(), borrower.getOpenBankId(), borrower.getBankCardNo(), borrower.getName());
+            ownerLoanRecord.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
+            ownerLoanRecord.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
+            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
+            ownerLoanRecord.setLoanResidueBalance(ownerLoanRecord.getLoanBalance());
+
+            ownerLoanRecord.setLendingParty(borrower.getName());
+            ownerLoanRecord.setLendingPartyAccount(borrower.getBankCardNo());
+
+            bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_DIRECT_PAY.getCode());
+        } else {
+            // 转账支付
+            NbBankOrderPayResultVO orderPayResultVO = bankService.orderTransferPay(ownerLoanRecord.getLoanBalance().intValue());
+            ownerLoanRecord.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
+            ownerLoanRecord.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
+            ownerLoanRecord.setRemittanceIdentificationCode(orderPayResultVO.getSignNo());
+            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
+            ownerLoanRecord.setLoanResidueBalance(ownerLoanRecord.getLoanBalance());
+
+            bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
+        }
+        // 更新借款支付信息
+        ownerLoanRecordDao.updatePay(ownerLoanRecord);
+
+        bankTrade.setRelationNo(ownerLoanRecord.getLoanNo().toString());
+        bankTrade.setOrderType(BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode());
+        bankTrade.setAmount(ownerLoanRecord.getLoanBalance());
+        bankTrade.setMerchantRunningWaterNo(ownerLoanRecord.getMerchantRunningWaterNo());
+        bankTrade.setRunningWaterOpenNo(ownerLoanRecord.getRunningWaterOpenNo());
+
+        // 保存银行交易记录
+        bankTradeDao.saveEntity(bankTrade);
+    }
+
 
     @Override
     public IPage<OwnerLoanRecordVO> pageOwnerLoanRecordOfOwner(PageOwnerLoanRecordOfOwner param) {