diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java index 2d15f3f855..e262710da3 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java @@ -162,4 +162,7 @@ public class AppCrmSolutions { private String nominalPrice; private List financeForms = new ArrayList<>(); + + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java index d8ba4597a1..3b1fa2ba58 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java @@ -156,4 +156,7 @@ public class CrmSolutions { private String vehTotalPrice; @ApiModelProperty("名义留购价") private String nominalPrice; + + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java index c168f297cd..3c3d99b945 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java @@ -32,5 +32,17 @@ public class PolicyVo implements Vo { private String bondRatioKey; @ApiModelProperty("标准年利率") private String yearRatio; + @ApiModelProperty("服务费类型") + private String serviceChargeTypeKey; + @ApiModelProperty("服务费") + private String serviceChargeTypeValue; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("名义/留够价款") + private String nominalPrice; + @ApiModelProperty("单车意外险") + private String vehAccidentAmount; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java index a12c88930f..d64d09f8cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java @@ -175,5 +175,10 @@ public class SolutionsDetailsVo implements Vo { @ApiModelProperty("实际首付比例") private String downPayAmountsRatio; + @ApiModelProperty("服务费类型") + private String serviceChargeTypeKey; + @ApiModelProperty("服务费") + private String serviceChargeTypeValue; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java index f2be48984c..d6af1db096 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java @@ -165,4 +165,10 @@ public class SolutionssVo implements Vo { @ApiModelProperty("拼接的List") private List financeForms = new ArrayList<>(); + + + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; + + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java index 448db716d0..536f2e46ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java @@ -134,7 +134,8 @@ public class LoanTemplateSolutionsDto implements Dto { private String dealWay; @ApiModelProperty("办理方式选择key") private String dealWayKey; - + @ApiModelProperty("代收合计") + private String proxyTotal; @ApiModelProperty("代收首年保险费") private String proxyPremium; @ApiModelProperty("代收购置费") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java index b8a772f531..e551648d5c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java @@ -125,6 +125,8 @@ public class LoanTemplateSolutionsVo implements Vo { private String dealWay; @ApiModelProperty("办理方式选择key") private String dealWayKey; + @ApiModelProperty("代收合计") + private String proxyTotal; @ApiModelProperty("代收首年保险费") private String proxyPremium; @ApiModelProperty("代收购置费") @@ -146,4 +148,9 @@ public class LoanTemplateSolutionsVo implements Vo { @ApiModelProperty("实际首付比例") private String downPayAmountsRatio; + + @ApiModelProperty("服务费类型") + private String serviceChargeTypeKey; + @ApiModelProperty("服务费") + private String serviceChargeTypeValue; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index e5d8843b12..189930cffa 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -96,7 +96,12 @@ lfp.periodKey, lfp.bondRatio, lfp.bondRatioKey, - lfp.yearRatio + lfp.yearRatio, + lfp.serviceAmountTypeKey as serviceChargeTypeKey, + lfp.serviceAmount as serviceChargeTypeValue, + lfp.depositPremium, + lfp.depositSettle, + lfp.nominalPrice from loan_fin_policy lfp where lfp.filingState = 1 and isPack = #{isPack} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index a0633f8831..00102d83b0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1052,12 +1052,31 @@ public class LoanSolutionsService extends MybatisBaseService formList = getFormList(solutionssVo); solutionssVo.setFinanceForms(formList); @@ -2241,7 +2355,7 @@ public class LoanSolutionsService extends MybatisBaseService financeForms = new ArrayList<>(); + private String serviceChargeTypeKey; + private String serviceChargeTypeValue; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java index 4cd8b4cd6d..550ad909e1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.risk.solutions; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,4 +33,16 @@ public class ExtraVo implements Vo { private String bondRatioKey; @ApiModelProperty("标准年利率") private String yearRatio; + @ApiModelProperty("服务费类型") + private String serviceChargeTypeKey; + @ApiModelProperty("服务费") + private String serviceChargeTypeValue; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("名义/留够价款") + private String nominalPrice; + @ApiModelProperty("单车意外险") + private String vehAccidentAmount; }