付款、借款列表收银台增加是否可以订单支付逻辑判断

performance-web/src/main/java/com/clx/performance/config/nbbank/NbBankConfig.java

@@ -16,5 +16,6 @@ public class NbBankConfig {
     private String configFilePath;
     private String publicKeyPath;
     private String privateKeyPath;
+    private String orderSupportBank;
 
 }

performance-web/src/main/java/com/clx/performance/extranal/user/OwnerInfoService.java

 package com.clx.performance.extranal.user;
 
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
+import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
@@ -9,4 +10,7 @@ public interface OwnerInfoService {
     OwnerInfoFeignVO getOwnerInfo(@RequestParam("userNo") Long userNo);
 
 
+    OwnerBindCardVO getOwnerBindCard(Long userNo);
+
+
 }

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OwnerInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.extranal.user.impl;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.user.feign.OwnerInfoFeign;
 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.result.Result;
@@ -23,4 +24,11 @@ public class OwnerInfoServiceImpl implements OwnerInfoService {
                 .filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL,"未查询到对应的货主信息");
     }
 
+
+    @Override
+    public OwnerBindCardVO getOwnerBindCard(Long userNo) {
+        return Optional.ofNullable(ownerInfoFeign.getOwnerInfoVO(userNo))
+                .filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL,"未查询到对应的货主绑卡信息");
+    }
+
 }

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.DeleteStatusEnum;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.loan.ClxPayeeConfig;
 import com.clx.performance.config.loan.PaymentFromConfig;
+import com.clx.performance.config.nbbank.NbBankConfig;
 import com.clx.performance.dao.OwnerBindCardRecordDao;
 import com.clx.performance.dao.loan.BorrowerDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountDao;
@@ -99,6 +101,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     private final ContractEvidenceFeign contractEvidenceFeign;
     private final ContractTemplateFeign contractTemplateFeign;
     private final PaymentFromConfig paymentFromConfig;
+    private final NbBankConfig nbBankConfig;
 
     @Override
     public IPage<OwnerLoanRecordVO> pageOwnerLoanRecord(PageCarrierOwnerLoanRecordParam param) {
@@ -318,7 +321,17 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
-        //TODO 设置支付方式和付款账户和银行名称 ，宇帆提供
+        Borrower borrower = borrowerDao.getEntityByKey(ownerLoanRecord.getBorrowerId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if(Objects.equals(borrower.getDeleteStatus(), DeleteStatusEnum.NO.getCode())){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+        vo.setOrderPayWay(false);
+        String bankName = borrower.getBankName();
+        if(nbBankConfig.getOrderSupportBank().contains(bankName)){
+            vo.setOrderPayWay(true);
+        }
+        vo.setBankName(bankName);
+        vo.setPayAccount(borrower.getBankCardNo());
         return vo;
     }
 

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

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.config.loan.ClxPayeeConfig;
 import com.clx.performance.config.loan.PaymentFromConfig;
+import com.clx.performance.config.nbbank.NbBankConfig;
 import com.clx.performance.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
+import com.clx.performance.extranal.user.impl.OwnerInfoServiceImpl;
 import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerRepaymentParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerRepaymentOfOwner;
@@ -21,6 +23,9 @@ 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.feign.OwnerInfoFeign;
+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;
 import com.msl.document.api.feign.ContractEvidenceFeign;
@@ -51,6 +56,9 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     private final ContractEvidenceFeign contractEvidenceFeign;
     private final ContractTemplateFeign contractTemplateFeign;
     private final PaymentFromConfig paymentFromConfig;
+    private final OwnerInfoServiceImpl ownerInfoService;
+    private final NbBankConfig nbBankConfig;
+
     @Override
     public IPage<OwnerRepaymentVO> pageOwnerRepayment(PageCarrierOwnerRepaymentParam param) {
         IPage<OwnerRepayment> page = ownerRepaymentDao.pageOwnerRepayment(param);
@@ -72,7 +80,15 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
-        //TODO 设置支付方式和付款账户和银行名称 ，宇帆提供
+
+        OwnerBindCardVO bindCard = ownerInfoService.getOwnerBindCard(ownerRepayment.getOwnerUserNo());
+        String ownerAccountBank = bindCard.getOwnerAccountBank();
+        vo.setOrderPayWay(false);
+        if(nbBankConfig.getOrderSupportBank().contains(ownerAccountBank)){
+            vo.setOrderPayWay(true);
+        }
+        vo.setBankName(ownerAccountBank);
+        vo.setPayAccount(bindCard.getOwnerBankAccount());
         return vo;
     }