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

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

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

@@ -76,6 +76,7 @@ public class OwnerRepaymentDaoImpl extends BaseDaoImpl<OwnerRepaymentMapper, Own
                 .set(OwnerRepayment::getRunningWaterOpenNo,ownerRepayment.getRunningWaterOpenNo())
                 .set(OwnerRepayment::getMerchantRunningWaterNo,ownerRepayment.getMerchantRunningWaterNo())
                 .set(OwnerRepayment::getPayChannel,ownerRepayment.getPayChannel())
+                .set(OwnerRepayment::getCloseOrderTime, ownerRepayment.getCloseOrderTime())
                 .set(OwnerRepayment::getPayment,ownerRepayment.getPayment())
                 .set(OwnerRepayment::getPaymentAccount,ownerRepayment.getPaymentAccount())
 

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

@@ -132,6 +132,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
             ownerRepayment.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
             ownerRepayment.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
             ownerRepayment.setRemittanceIdentificationCode(orderPayResultVO.getSignNo());
+            ownerRepayment.setCloseOrderTime(orderPayResultVO.getCloseDtTm());
             bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
         }
         ownerRepayment.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());