修改导出VO的类

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

+package com.clx.performance.vo.pc.loan.carrier;
+
+import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
+import com.clx.performance.enums.loan.OwnerRePaymentEnum;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @author kavin
+ * Date 2024-01-20
+ * Time 17:05
+ */
+@Getter
+@Setter
+public class ExportOwnerLoanRecordVO {
+
+    private Integer id;
+
+   
+    @ApiModelProperty("货主编码")
+    private String ownerUserNo;
+
+   
+    @ApiModelProperty("货主名称")
+    private String ownerUserName;
+
+   
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+   
+    @ApiModelProperty("交易流水号（第三方）")
+    private String runningWaterOpenNo;
+
+    @ApiModelProperty("商户流水号")
+    private String merchantRunningWaterNo;
+
+    @ApiModelProperty("汇款识别码")
+    private String remittanceIdentificationCode;
+
+   
+    @ApiModelProperty("借款单号")
+    private String loanNo;
+
+   
+    @ApiModelProperty("借款类型 1:虚拟货币  2:资金")
+    private Integer loanType;
+
+    @ApiModelProperty("借款类型 虚拟货币  资金")
+    private String loanTypeMsg;
+
+    public String getLoanTypeMsg(){
+        return OwnerLoanRecordEnum.LoanType.getMsgByCode(loanType);
+    }
+
+    @ApiModelProperty("借款金额")
+    private BigDecimal loanBalance;
+
+
+    public BigDecimal getLoanBalance(){
+        return Objects.isNull(loanBalance)?BigDecimal.ZERO:loanBalance.movePointLeft(2);
+    }
+
+
+
+    @ApiModelProperty("借款方")
+    private String borrower;
+
+   
+    @ApiModelProperty("借出方")
+    private String lendingParty;
+
+   
+    @ApiModelProperty("借出方账户")
+    private String lendingPartyAccount;
+
+   
+    @ApiModelProperty("收款方")
+    private String payee;
+
+   
+    @ApiModelProperty("收款账户")
+    private String payeeAccount;
+
+
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
+   
+    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    private Integer status;
+
+
+    @ApiModelProperty("10 待审批  20 审批通过   30 审批拒绝  40 付款中  50 付款成功 60 付款失败 ")
+    private String statusMsg;
+
+    public String getStatusMsg(){
+        return OwnerLoanRecordEnum.Status.getMsgByCode(status);
+    }
+
+
+   
+    @ApiModelProperty("审批时间")
+    private String approveTime;
+
+   
+    @ApiModelProperty("审批人")
+    private String approveBy;
+
+   
+    @ApiModelProperty("拒绝原因")
+    private String rejectReason;
+
+   
+    @ApiModelProperty("借款归还时间")
+    private String loanRepaymentTime;
+
+
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private Integer payChannel;
+
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private String payChannelMsg;
+
+    public String getPayChannelMsg(){
+        return OwnerRePaymentEnum.Channel.getMsgByCode(payChannel);
+    }
+
+   
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+   
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+   
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

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

+package com.clx.performance.vo.pc.loan.owner;
+
+import com.clx.performance.enums.loan.OwnerRePaymentEnum;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @ClassName OwnerRepayment
+ * @Description
+ * @Author kavin
+ * @Date 2024/1/20 15:18
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class ExportOwnerRepaymentVO {
+
+    private Integer id;
+
+    
+    @ApiModelProperty("货主编码")
+    private String ownerUserNo;
+
+    
+    @ApiModelProperty("货主名称")
+    private String ownerUserName;
+
+    
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    
+    @ApiModelProperty("交易流水号（第三方）")
+    private String runningWaterOpenNo;
+
+    @ApiModelProperty("商户流水号")
+    private String merchantRunningWaterNo;
+
+    
+    @ApiModelProperty("还款单号")
+    private Long repaymentNo;
+
+    @ApiModelProperty("还款金额")
+    private BigDecimal repaymentBalance;
+
+    public BigDecimal getRepaymentBalance(){
+        return Objects.isNull(repaymentBalance)?BigDecimal.ZERO:repaymentBalance.movePointLeft(2);
+    }
+
+
+    
+    @ApiModelProperty("付款方")
+    private String payment;
+
+    
+    @ApiModelProperty("付款账户")
+    private String paymentAccount;
+
+
+    @ApiModelProperty("汇款识别码")
+    private String remittanceIdentificationCode;
+
+
+    
+    @ApiModelProperty("收款方")
+    private String payee;
+
+    
+    @ApiModelProperty("收款账户")
+    private String payeeAccount;
+
+
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+
+
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
+
+    @ApiModelProperty("10 待付款 40 付款中 50 付款成功 60 付款失败")
+    private Integer status;
+
+
+    @ApiModelProperty("10 待付款 40 付款中 50 付款成功 60 付款失败")
+    private String statusMsg;
+
+    public String getStatusMsg(){
+        return OwnerRePaymentEnum.Status.getMsgByCode(status);
+    }
+
+
+    
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private Integer payChannel;
+
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private String payChannelMsg;
+
+    public String getPayChannelMsg(){
+        return OwnerRePaymentEnum.Channel.getMsgByCode(payChannel);
+    }
+
+    
+    @ApiModelProperty("10 未逾期  20 已逾期")
+    private Integer beOverdue;
+
+    @ApiModelProperty("10 未逾期  20 已逾期")
+    private String beOverdueMsg;
+
+    public String getBeOverdueMsg(){
+        return OwnerRePaymentEnum.BeOverdue.getMsgByCode(beOverdue);
+    }
+    
+    @ApiModelProperty("借款归还时间")
+    private String loanRepaymentTime;
+
+    
+    @ApiModelProperty("操作时间")
+    private String operateTime;
+
+    
+    @ApiModelProperty("操作人")
+    private String operateBy;
+
+    
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    
+    @ApiModelProperty("生成付款申请单时间")
+    private String createTime;
+
+    
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+
+    @ApiModelProperty("收款银行")
+    private String payeeBank;
+
+
+    @ApiModelProperty("收款行号")
+    private String payeeBankCode;
+
+}

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

@@ -307,9 +307,9 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
     public String savePaymentApplicationForm(ExportPaymentApplicationFormParam param) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(param.getId()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        OwnerLoanRecordVO ownerLoanRecordVO = ownerLoanRecordStruct.convert(ownerLoanRecord);
+        ExportOwnerLoanRecordVO exportOwnerLoanRecordVO = ownerLoanRecordStruct.convert(ownerLoanRecord);
         //货主借款：  收款方鑫祥和  付款方为诚联信    借款方为货主
-        Map<String,String> map = JSON.parseObject(JSON.toJSONString(ownerLoanRecordVO), new TypeReference<Map<String,String>>(){});
+        Map<String,String> map = JSON.parseObject(JSON.toJSONString(exportOwnerLoanRecordVO), new TypeReference<Map<String,String>>(){});
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
         if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){

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

@@ -17,6 +17,7 @@ import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam
 import com.clx.performance.service.loan.OwnerRepaymentService;
 import com.clx.performance.struct.loan.OwnerRepaymentStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
+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;
@@ -102,8 +103,8 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     public String savePaymentApplicationForm(ExportPaymentApplicationFormParam param) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(param.getId()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        OwnerRepaymentVO ownerRepaymentVO = ownerRepaymentStruct.convert(ownerRepayment);
-        Map<String,String> map = JSON.parseObject(JSON.toJSONString(ownerRepaymentVO), new TypeReference<Map<String,String>>(){});
+        ExportOwnerRepaymentVO exportOwnerRepaymentVO = ownerRepaymentStruct.convert(ownerRepayment);
+        Map<String,String> map = JSON.parseObject(JSON.toJSONString(exportOwnerRepaymentVO), new TypeReference<Map<String,String>>(){});
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
         if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerLoanRecordStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.loan;
 
 import com.clx.performance.model.loan.OwnerLoanRecord;
 import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
+import com.clx.performance.vo.pc.loan.carrier.ExportOwnerLoanRecordVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.msl.common.utils.DateStructUtil;
@@ -20,5 +21,5 @@ public interface OwnerLoanRecordStruct {
 
     OwnerOrderPaymentDetailVO convertOrderPaymentDetail(OwnerLoanRecord ownerLoanRecord);
 
-    OwnerLoanRecordVO convert(OwnerLoanRecord ownerLoanRecord);
+    ExportOwnerLoanRecordVO convert(OwnerLoanRecord ownerLoanRecord);
 }

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerRepaymentStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.loan;
 
 import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
+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.msl.common.utils.DateStructUtil;
@@ -14,7 +15,7 @@ import java.util.Objects;
 public interface OwnerRepaymentStruct {
 
 
-    OwnerRepaymentVO convert(OwnerRepayment ownerRepayment);
+    ExportOwnerRepaymentVO convert(OwnerRepayment ownerRepayment);
 
     List<OwnerRepaymentVO> convertList(List<OwnerRepayment> list);