借款相关

performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierOwnerLoanRecordController.java

@@ -36,7 +36,7 @@ public class CarrierOwnerLoanRecordController {
         return Result.page(page.getRecords(),page.getTotal(),page.getPages());
     }
 
-    @ApiOperation(value = "借款列表",notes = "<br>By:刘海泉")
+    @ApiOperation(value = "借款审批",notes = "<br>By:胡宇帆")
     @PostMapping("/ownerLoanRecordApprove")
     public Result<Object> ownerLoanRecordApprove(@RequestBody @Validated CarrierOwnerLoanRecordApproveParam param) {
         ownerLoanRecordService.ownerLoanRecordApprove(param);

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

@@ -42,7 +42,11 @@ public class OwnerLoanRecord implements HasKey<Integer> {
 
     @TableField("running_water_open_no")
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
+
+    @TableField("merchant_running_water_no")
+    @ApiModelProperty("商户流水号")
+    private String merchantRunningWaterNo;
 
     @TableField("loan_no")
     @ApiModelProperty("借款单号")

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

@@ -42,7 +42,11 @@ public class OwnerRepayment implements HasKey<Integer> {
 
     @TableField("running_water_open_no")
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
+
+    @TableField("merchant_running_water_no")
+    @ApiModelProperty("商户流水号")
+    private String merchantRunningWaterNo;
 
     @TableField("repayment_no")
     @ApiModelProperty("还款单号")

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

@@ -18,8 +18,10 @@ import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
+import com.clx.performance.service.thirdparty.nbbank.NbBankService;
 import com.clx.performance.struct.loan.OwnerLoanRecordStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -53,6 +55,8 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
 
     private final OwnerBindCardRecordDao ownerBindCardRecordDao;
 
+    private final NbBankService bankService;
+
     @Override
     public IPage<OwnerLoanRecordVO> pageOwnerLoanRecord(PageCarrierOwnerLoanRecordParam param) {
         IPage<OwnerLoanRecord> page = ownerLoanRecordDao.pageOwnerLoanRecord(param);
@@ -103,6 +107,9 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
 
             if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
                 //资金 TODO 调中信银企直连的产品，从诚联信账户中给鑫祥和执行转账
+                NbBankOrderPayResultVO orderPayResultVO = bankService.orderDirectPay(null, "", "", "");
+                ownerLoanRecord.setRunningWaterOpenNo(orderPayResultVO.getTransSeqNo());
+                ownerLoanRecord.setMerchantRunningWaterNo(orderPayResultVO.getMerSeqNo());
                 ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
 
                 //创建还款记录
@@ -160,9 +167,9 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
         ownerRepayment.setPayeeAccount(ownerLoanRecord.getBorrowerAccount());
         ownerRepayment.setPayee(ownerRepayment.getPayee());
         ownerRepayment.setPayeeAccount(ownerLoanRecord.getPayeeAccount());
-        //TODO 支付渠道  订单支付,转账支付   缺三方的交易流水号
-        ownerRepayment.setPayChannel(0);
-        ownerRepayment.setRunningWaterOpenNo(0L);
+        ownerRepayment.setPayChannel(OwnerRePaymentEnum.Channel.ORDER.getCode());
+        ownerRepayment.setRunningWaterOpenNo(ownerLoanRecord.getRunningWaterOpenNo());
+        ownerRepayment.setMerchantRunningWaterNo(ownerLoanRecord.getMerchantRunningWaterNo());
         ownerRepayment.setBeOverdue(OwnerRePaymentEnum.BeOverdue.NO.getCode());
         ownerRepayment.setCreateBy("系统");
         ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java

 package com.clx.performance.service.impl.thirdparty.nbbank;
 
 import com.alibaba.fastjson.JSONObject;
+import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.service.thirdparty.nbbank.NbBankService;
 import com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService;
 import com.clx.performance.utils.LocalDateTimeUtils;
@@ -25,6 +26,9 @@ public class NbBankServiceImpl implements NbBankService {
     @Autowired
     private NbBankThirdpartyService bankThirdpartyService;
 
+    @Autowired
+    private IdGenerateSnowFlake idGenerateSnowFlake;
+
 
     /**
      * 转账支付
@@ -60,7 +64,7 @@ public class NbBankServiceImpl implements NbBankService {
     @Override
     public NbBankOrderPayResultVO orderDirectPay(Integer amount,
                                                  String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
-        String merSeqNo = merSeqNoGenerate();
+        String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
 
         String merDtTm = LocalDateTimeUtils.formatTime();
         JSONObject data = bankThirdpartyService.unionPayDirectOrder(merSeqNo, merDtTm, amount,