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

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanRecordDaoImpl.java

@@ -89,6 +89,7 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
                 .set(OwnerLoanRecord::getRunningWaterOpenNo, item.getRunningWaterOpenNo())
                 .set(OwnerLoanRecord::getMerchantRunningWaterNo, item.getMerchantRunningWaterNo())
                 .set(OwnerLoanRecord::getRemittanceIdentificationCode, item.getRemittanceIdentificationCode())
+                .set(OwnerLoanRecord::getCloseOrderTime, item.getCloseOrderTime())
                 .set(OwnerLoanRecord::getLoanResidueBalance, item.getLoanResidueBalance())
                 .set(OwnerLoanRecord::getRemittanceIdentificationCode, item.getRemittanceIdentificationCode())
                 .set(OwnerLoanRecord::getLendingParty, item.getLendingParty())

performance-web/src/main/java/com/clx/performance/model/loan/OwnerLoanRecord.java

@@ -159,7 +159,7 @@ public class OwnerLoanRecord implements HasKey<Integer> {
 
 
     @TableField("pay_channel")
-    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    @ApiModelProperty("支付渠道 1 订单支付 2 转账支付")
     private Integer payChannel;
 
 

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

@@ -273,6 +273,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
             ownerLoanRecord.setLoanResidueBalance(ownerLoanRecord.getLoanBalance());
             ownerLoanRecord.setRemittanceIdentificationCode(orderPayResultVO.getSignNo());
+            ownerLoanRecord.setCloseOrderTime(orderPayResultVO.getCloseDtTm());
             bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
         }
         // 更新借款支付信息
@@ -686,10 +687,13 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
         ownerLoanRecordDao.updateStatusById(ownerLoanRecord);
 
+        if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(ownerLoanRecord.getPayChannel())) {
+            //如果是订单支付,需要调用宁波退款接口
             BankTrade bankTrade = bankTradeDao.selectByRelationNo(loanNo).get();
             Integer tradeType = bankTrade.getTradeType();
             // 调用宁波退款
             bankService.refund(tradeType, bankTrade.getMerchantRunningWaterNo(), Integer.parseInt(ownerLoanRecord.getLoanBalance().toString()), bankTrade.getRunningWaterOpenNo());
+        }
 
     }
 

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

@@ -244,13 +244,15 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         log.info("还款记录取消，更新状态为待审批");
         ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());
         ownerRepaymentDao.updateStatusById(ownerRepayment);
-
+        if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(ownerRepayment.getPayChannel())) {
             Integer tradeType = bankTrade.getTradeType();
             // 调用宁波退款
             bankService.refund(tradeType, bankTrade.getMerchantRunningWaterNo(), Integer.valueOf(ownerRepayment.getRepaymentBalance().movePointRight(2).toString()), bankTrade.getRunningWaterOpenNo());
 
         }
 
+    }
+
     @Override
     public void ownerRepaymentRetryPay(String repaymentNo) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getOneByField(OwnerRepayment::getRepaymentNo, repaymentNo)