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

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

@@ -75,6 +75,11 @@ public class OwnerRepaymentDaoImpl extends BaseDaoImpl<OwnerRepaymentMapper, Own
                 .set(OwnerRepayment::getStatus, ownerRepayment.getStatus())
                 .set(OwnerRepayment::getRunningWaterOpenNo,ownerRepayment.getRunningWaterOpenNo())
                 .set(OwnerRepayment::getMerchantRunningWaterNo,ownerRepayment.getMerchantRunningWaterNo())
+                .set(OwnerRepayment::getPayChannel,ownerRepayment.getPayChannel())
+                .set(OwnerRepayment::getPayment,ownerRepayment.getPayment())
+                .set(OwnerRepayment::getPaymentAccount,ownerRepayment.getPaymentAccount())
+
+
         );
     }
 

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

@@ -14,6 +14,7 @@ import com.clx.performance.enums.loan.BankTradeEnum;
 import com.clx.performance.enums.loan.OwnerLoanAccountApproveEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
+import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.model.loan.*;
@@ -27,6 +28,7 @@ import com.clx.performance.struct.loan.OwnerLoanAccountStruct;
 import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
+import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.base.Optional;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.user.data.UserSessionData;
@@ -58,15 +60,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
 
     private final OwnerLoanAccountStruct ownerLoanAccountStruct;
 
-    private final OrderChildDao orderChildDao;
-
-    private final SettlementDriverDetailDao settlementDriverDetailDao;
-
-    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
-
-    private final OrderChildLoanRetryRecordDao orderChildLoanRetryRecordDao;
-
-    private final RabbitTemplate rabbitTemplate;
+    private final OwnerInfoService ownerInfoService;
 
     private final OwnerRepaymentDao ownerRepaymentDao;
 
@@ -140,6 +134,10 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
             bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
         }
         ownerRepayment.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
+        ownerRepayment.setPayChannel(param.getPayChannel());
+        OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(TokenUtil.getLoginUserInfo().getUserNo());
+        ownerRepayment.setPayment(ownerInfo.getName());
+        ownerRepayment.setPaymentAccount(ownerInfo.getOwnerBankAccount());
 
         // 更新还款支付信息
         ownerRepaymentDao.updateRePay(ownerRepayment);

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

@@ -85,5 +85,6 @@ public class OwnerPaymentServiceImpl implements OwnerPaymentService {
             ownerPayment.setStatus(OwnerPaymentEnum.Status.PAYING.getCode());
             ownerPaymentDao.updateStatusAndMerchantRunningWaterNo(ownerPayment);
         }
+
     }
 }