提交还款申请单pdf生成接口

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanAccountApproveVO.java

@@ -39,7 +39,7 @@ public class OwnerLoanAccountApproveVO {
 
     
     @ApiModelProperty("审批时间")
-    private LocalDateTime approveTime;
+    private String approveTime;
 
     
     @ApiModelProperty("审批人")
@@ -55,10 +55,10 @@ public class OwnerLoanAccountApproveVO {
 
     
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
     
     @ApiModelProperty("修改时间")
-    private LocalDateTime modifiedTime;
+    private String modifiedTime;
 
 }

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanAccountRunningWaterRecordVO.java

@@ -47,6 +47,6 @@ public class OwnerLoanAccountRunningWaterRecordVO {
     @ApiModelProperty(value = "创建人", example = "张三")
     private String createBy;
     @ApiModelProperty(value = "创建时间", example = "")
-    private LocalDateTime createTime;
+    private String createTime;
 
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanRecordVO.java

@@ -90,7 +90,7 @@ public class OwnerLoanRecordVO {
 
    
     @ApiModelProperty("审批时间")
-    private LocalDateTime approveTime;
+    private String approveTime;
 
    
     @ApiModelProperty("审批人")
@@ -102,7 +102,7 @@ public class OwnerLoanRecordVO {
 
    
     @ApiModelProperty("借款归还时间")
-    private LocalDateTime loanRepaymentTime;
+    private String loanRepaymentTime;
 
    
     @ApiModelProperty("创建人")
@@ -110,10 +110,10 @@ public class OwnerLoanRecordVO {
 
    
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
    
     @ApiModelProperty("修改时间")
-    private LocalDateTime modifiedTime;
+    private String modifiedTime;
 
 }

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerRepaymentVO.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @ClassName OwnerRepayment
@@ -37,6 +38,9 @@ public class OwnerRepaymentVO {
     @ApiModelProperty("交易流水号（第三方）")
     private Long runningWaterOpenNo;
 
+    @ApiModelProperty("商户流水号")
+    private String merchantRunningWaterNo;
+
     
     @ApiModelProperty("还款单号")
     private Long repaymentNo;
@@ -53,6 +57,14 @@ public class OwnerRepaymentVO {
     @ApiModelProperty("付款账户")
     private String paymentAccount;
 
+    @ApiModelProperty("生成付款申请单时间")
+    private String paymentApplicationFormTime;
+
+
+    @ApiModelProperty("汇款识别码")
+    private String remittanceIdentificationCode;
+
+
     
     @ApiModelProperty("收款方")
     private String payee;

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

@@ -57,7 +57,7 @@ public class OrderPaymentDetailVO {
         return OwnerRePaymentEnum.Status.getMsgByCode(status);
     }
 
-    @ApiModelProperty("付款倒计时 (秒)")
-    public Long paymentCountdown;
+    @ApiModelProperty("付款最终时间")
+    public String finalPaymentTime;
 
 }

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

@@ -56,8 +56,8 @@ public class TransferPaymentDetailVO {
         return OwnerRePaymentEnum.Status.getMsgByCode(status);
     }
 
-    @ApiModelProperty("付款倒计时 (秒)")
-    public Long paymentCountdown;
+    @ApiModelProperty("付款最后时间")
+    public String finalPaymentTime;
 
 
 }

performance-web/src/main/java/com/clx/performance/config/loan/PaymentFromConfig.java

+package com.clx.performance.config.loan;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "payment.form")
+public class PaymentFromConfig {
+
+    //模版编号
+    private Long templateNo;
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerLoanRecordController.java

@@ -32,7 +32,7 @@ public class OwnerLoanRecordController {
 
 
 
-    @ApiOperation(value = "分页搜索货主借款列表",notes = "<br>By:刘海泉")
+    @ApiOperation(value = "借款列表",notes = "<br>By:刘海泉")
     @PostMapping("/pageOwnerLoanRecordOfOwner")
     @UnitCovert(param = false)
     public Result<PageData<OwnerLoanRecordVO>> pageOwnerLoanRecordOfOwner(@RequestBody @Validated PageOwnerLoanRecordOfOwner param) {

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

 package com.clx.performance.service.impl.loan;
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 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.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 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;
@@ -15,15 +19,20 @@ import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
 import com.clx.performance.vo.pc.loan.owner.CashierInfoVO;
 import com.clx.performance.vo.pc.loan.owner.OrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.TransferPaymentDetailVO;
+import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import com.msl.document.api.feign.ContractEvidenceFeign;
 import com.msl.document.api.feign.ContractTemplateFeign;
+import com.msl.document.api.param.GenerateContractParam;
+import com.msl.document.api.vo.ContractEvidenceRecordVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author kavin
@@ -39,6 +48,7 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     private final OwnerRepaymentStruct ownerRepaymentStruct;
     private final ContractEvidenceFeign contractEvidenceFeign;
     private final ContractTemplateFeign contractTemplateFeign;
+    private final PaymentFromConfig paymentFromConfig;
     @Override
     public IPage<OwnerRepaymentVO> pageOwnerRepayment(PageCarrierOwnerRepaymentParam param) {
         IPage<OwnerRepayment> page = ownerRepaymentDao.pageOwnerRepayment(param);
@@ -70,7 +80,7 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         OrderPaymentDetailVO vo = ownerRepaymentStruct.convertOrderPaymentDetail(ownerRepayment);
         //TODO 设置付款倒计时
-        vo.setPaymentCountdown(null);
+        vo.setFinalPaymentTime(null);
         return vo;
     }
 
@@ -81,32 +91,31 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         ClxPayeeConfig.PayeeConfig payeeMap = ClxPayeeConfig.getPayeeMap(ClxPayeeConfig.XXH_ID);
 
         //计算倒计时时间，下单时间 + 30天 为截止时间
-        LocalDateTime startTime = LocalDateTime.now();
         LocalDateTime endTime = ownerRepayment.getPaymentApplicationFormTime().plusDays(30);
-        long seconds = Duration.between(startTime, endTime).getSeconds();
         return TransferPaymentDetailVO.builder().payee(payeeMap.getName())
                 .payeeAccount(payeeMap.getAccount()).payeeBank(payeeMap.getBank()).payeeBankNo(payeeMap.getBankNo())
                 .repaymentBalance(ownerRepayment.getRepaymentBalance())
                 .remittanceIdentificationCode(ownerRepayment.getRemittanceIdentificationCode())
-                .status(ownerRepayment.getStatus()).paymentCountdown(seconds).build();
+                .status(ownerRepayment.getStatus()).finalPaymentTime(DateUtils.formatDateTime(endTime).get()).build();
     }
 
     @Override
     public String savePaymentApplicationForm(ExportPaymentApplicationFormParam param) {
-/*        OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(param.getId()).orElseThrow(
+        OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(param.getId()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-
         OwnerRepaymentVO ownerRepaymentVO = ownerRepaymentStruct.convert(ownerRepayment);
         Map<String,String> map = JSON.parseObject(JSONUtil.parse(ownerRepaymentVO).toString(), Map.class);
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
-        feignParam.setTemplateNo(orderContractConfig.getTransportNo());
-        feignParam.setParametersValueMap(map);
+        if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){
+            feignParam.setTemplateNo(paymentFromConfig.getTemplateNo());
+        }else{
+            feignParam.setTemplateNo(paymentFromConfig.getTemplateNo());
+        }
 
-        Result<Long> longResult = contractTemplateFeign.generateContract(param);
-        Result<ContractEvidenceRecordVo> contractEvidenceDetail = contractEvidenceFeign.getContractEvidenceDetail(longResult.getData());*/
-
-        //return contractEvidenceDetail.getData().getFileUrl();
-        return null;
+        feignParam.setParametersValueMap(map);
+        Result<Long> longResult = contractTemplateFeign.generateContract(feignParam);
+        Result<ContractEvidenceRecordVo> contractEvidenceDetail = contractEvidenceFeign.getContractEvidenceDetail(longResult.getData());
+        return contractEvidenceDetail.getData().getFileUrl();
     }
 }