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

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerPaymentVO.java

@@ -37,6 +37,9 @@ public class OwnerPaymentVO{
     @ApiModelProperty("交易流水号（第三方）")
     private String runningWaterOpenNo;
 
+    @ApiModelProperty("商户流水")
+    private String merchantRunningWaterNo;
+
     
     @ApiModelProperty("付款单号")
     private Long paymentNo;

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

@@ -52,6 +52,8 @@ public class OwnerPaymentDaoImpl extends BaseDaoImpl<OwnerPaymentMapper, OwnerPa
     public void updateStatusAndMerchantRunningWaterNo(OwnerPayment ownerPayment) {
         update(lUdWrapper().set(OwnerPayment::getStatus, ownerPayment.getStatus())
                 .set(OwnerPayment::getMerchantRunningWaterNo, ownerPayment.getMerchantRunningWaterNo())
+                .set(OwnerPayment::getOperateBy, ownerPayment.getOperateBy())
+                .set(OwnerPayment::getOperateTime, ownerPayment.getOperateTime())
                 .eq(OwnerPayment::getId, ownerPayment.getId())
         );
     }

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

@@ -115,8 +115,8 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
         if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(param.getPayChannel())) {
             // 订单支付
             NbBankOrderPayResultVO orderPayResultVO = bankService.orderDirectPay(ownerRepayment.getRepaymentNo(), "还款单",
-                    ownerRepayment.getRepaymentBalance().intValue(), ownerLoanRecord.getLendingPartyBankCode(),
-                    ownerLoanRecord.getLendingPartyAccount(), ownerBindCardRecord.getAccountBankName());
+                    ownerRepayment.getRepaymentBalance().intValue(), ownerBindCardRecord.getOpenAccountBankNumber(),
+                    ownerBindCardRecord.getBankCardNumber(), ownerBindCardRecord.getAccountBankName());
             ownerRepayment.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
             ownerRepayment.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
 

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

@@ -18,11 +18,13 @@ import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerPaymentVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerPaymentVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -85,6 +87,8 @@ public class OwnerPaymentServiceImpl implements OwnerPaymentService {
         }
         ownerPayment.setMerchantRunningWaterNo(merSeqNo);
         ownerPayment.setStatus(OwnerPaymentEnum.Status.PAYING.getCode());
+        ownerPayment.setOperateBy(TokenUtil.getLoginUserInfo().getUserName());
+        ownerPayment.setOperateTime(LocalDateTime.now());
         ownerPaymentDao.updateStatusAndMerchantRunningWaterNo(ownerPayment);
 
     }