货主借款记录增加借款方和借出方的银行账户快照信息

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerOrderPaymentDetailVO.java

@@ -26,6 +26,9 @@ public class OwnerOrderPaymentDetailVO {
     @ApiModelProperty("还款单号")
     private Long repaymentNo;
 
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
     @ApiModelProperty("付款方")
     private String payment;
 

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerTransferPaymentDetailVO.java

@@ -22,6 +22,16 @@ import java.math.BigDecimal;
 @Builder
 public class OwnerTransferPaymentDetailVO {
 
+
+
+    @ApiModelProperty("还款单号")
+    private Long repaymentNo;
+
+
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
+
     @ApiModelProperty("收款户名")
     private String payee;
 

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

@@ -80,6 +80,19 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @TableField("borrower_account")
     private String borrowerAccount;
 
+
+    @TableField("borrower_bank")
+    @ApiModelProperty("借出方银行")
+    private String borrowerBank;
+
+    @TableField("borrower_bank_num")
+    @ApiModelProperty("借出方银行行号")
+    private String borrowerBankNum;
+
+    @TableField("borrower_open_bank")
+    @ApiModelProperty("借出方开户行")
+    private String borrowerOpenBank;
+
     @TableField("remittance_identification_code")
     @ApiModelProperty("汇款识别码")
     private String remittanceIdentificationCode;
@@ -93,6 +106,20 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @ApiModelProperty("借款方账户")
     private String lendingPartyAccount;
 
+    @TableField("lending_party_bank")
+    @ApiModelProperty("借款方银行")
+    private String lendingPartyBank;
+
+    @TableField("lending_party_bank_id")
+    @ApiModelProperty("借款方银行行号")
+    private String lendingPartyBankId;
+
+    @TableField("lending_party_open_bank")
+    @ApiModelProperty("借款方开户行")
+    private String lendingPartyOpenBank;
+
+
+
     @TableField("payee")
     @ApiModelProperty("收款方")
     private String payee;

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

@@ -29,6 +29,7 @@ import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.clx.performance.enums.nbbank.NbBankStatusEnum;
+import com.clx.performance.extranal.user.impl.OwnerInfoServiceImpl;
 import com.clx.performance.model.OwnerBindCardRecord;
 import com.clx.performance.model.loan.*;
 import com.clx.performance.param.pc.loan.carrier.*;
@@ -45,6 +46,7 @@ import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderResultVO;
 import com.clx.user.feign.OwnerFeign;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
+import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import com.msl.common.base.Optional;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
@@ -103,7 +105,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     private final ContractTemplateFeign contractTemplateFeign;
     private final PaymentFromConfig paymentFromConfig;
     private final NbBankConfig nbBankConfig;
-    private final ClxPayeeConfig clxPayeeConfig;
+    private final OwnerInfoServiceImpl ownerInfoService;
     private final ClxMessageOpenapiFeign clxMessageOpenapiFeign;
     private final ClxMessageConfig messageConfig;
 
@@ -161,6 +163,21 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             //同意
             ownerLoanRecord.setLoanType(param.getLoanType());
 
+            //设置借款记录中借款方和借出方的银行账户信息
+            OwnerInfoFeignVO ownerInfoFeignVO = ownerInfoService.getOwnerInfo(ownerLoanRecord.getOwnerUserNo());
+            String ownerAccountBank = ownerInfoFeignVO.getOwnerAccountBank();
+            ownerLoanRecord.setLendingParty(ownerInfoFeignVO.getName());
+            ownerLoanRecord.setLendingPartyBank(ownerAccountBank);
+            ownerLoanRecord.setLendingPartyAccount(ownerInfoFeignVO.getOwnerBankAccount());
+            ownerLoanRecord.setLendingPartyOpenBank(ownerInfoFeignVO.getOwnerOpenBank());
+            ownerLoanRecord.setLendingPartyBankId(ownerInfoFeignVO.getOwnerOpenBankNumber());
+            //设置借款记录中借出方的银行账户信息
+            ownerLoanRecord.setBorrower(borrower.getName());
+            ownerLoanRecord.setBorrowerAccount(borrower.getBankCardNo());
+            ownerLoanRecord.setBorrowerBank(borrower.getBankName());
+            ownerLoanRecord.setBorrowerOpenBank(borrower.getOpenBankName());
+            ownerLoanRecord.setBorrowerBankNum(borrower.getOpenBankId());
+
             if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
                 //ownerLoanRecord.setStatus()
                 fundPayProcess(param, ownerLoanRecord, borrower);

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

@@ -26,6 +26,7 @@ import com.clx.performance.vo.pc.loan.owner.ExportOwnerRepaymentVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerCashierInfoVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerTransferPaymentDetailVO;
+import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
@@ -106,14 +107,14 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
 
-        OwnerBindCardVO bindCard = ownerInfoService.getOwnerBindCard(ownerRepayment.getOwnerUserNo());
-        String ownerAccountBank = bindCard.getOwnerAccountBank();
+        OwnerInfoFeignVO ownerInfoFeignVO = ownerInfoService.getOwnerInfo(ownerRepayment.getOwnerUserNo());
+        String ownerAccountBank = ownerInfoFeignVO.getOwnerAccountBank();
         vo.setOrderPayWay(false);
         if(nbBankConfig.getOrderSupportBank().contains(ownerAccountBank)){
             vo.setOrderPayWay(true);
         }
         vo.setBankName(ownerAccountBank);
-        vo.setPayAccount(bindCard.getOwnerBankAccount());
+        vo.setPayAccount(ownerInfoFeignVO.getOwnerBankAccount());
         return vo;
     }