优化

2 years ago · 3e65408b07
11 changed files with 193 additions and 3 deletions
--- 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<CrmSolutionListVo> financeForms = new ArrayList<>();
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
 }
--- 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;
 }
--- 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;

 }
--- 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;
+

 }
--- 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<SolutionListVo> financeForms = new ArrayList<>();
+
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
+
+
 }
--- 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("代收购置费")
--- 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;
 }
--- 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}
--- 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<LoanSolutionsMapper
                            solutionsDetailsVo.setShowMore(false);
                        } else {
                            solutionsDetailsVo.setShowMore(true);
+                            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
+                            if(loanFinPolicy != null){
+                                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                                solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                                if(serviceChargeTypeValue != null){
+                                    solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                                }
+                            }
                        }
                    } else {
                        solutionsDetailsVo.setShowMore(false);
                    }
                } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                    solutionsDetailsVo.setShowMore(true);
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
+
                }
            }
        }
@ -1153,6 +1172,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
        if (loanSolutionsDetail != null) {
            BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
        }
+        LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+        if(loanFinPolicy != null){
+            String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+            BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+            solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+            if(serviceChargeTypeValue != null){
+                solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+            }
+        }
        return rb.success().setData(solutionsDetailsVo);
    }

@ -1578,6 +1606,33 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                            solutionssVo.setShowMore(false);
                        } else {
                            solutionssVo.setShowMore(true);
+                            solutionssVo.setFactoryDiscountUse("抵利息");
+                            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                            if(loanFinPolicy != null){
+                                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                                solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                                if(serviceChargeTypeValue != null){
+                                    solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                                }
+                            }
+                            if (isTrue) {
+                                if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
+                                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                                    if (loanFinOtherPolicy != null) {
+                                        solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
+                                        solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
+                                        solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
+                                        solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
+                                        solutionssVo.setOtherPolicyIsMain(true);
+                                    }
+                                } else {
+                                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                                    if (loanFinOtherPolicy != null) {
+                                        solutionssVo.setOtherPolicyIsMain(true);
+                                    }
+                                }
+                            }
                        }
                    } else {
                        solutionssVo.setShowMore(false);
@ -1585,6 +1640,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                    solutionssVo.setShowMore(true);
                    solutionssVo.setFactoryDiscountUse("抵利息");
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
                    if (isTrue) {
                        if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
                            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
@ -2155,6 +2219,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
        SolutionssVo solutionssVo = new SolutionssVo();
        BeanUtil.copyProperties(query, solutionssVo);
        if (query.isShowMore()) {
+
+
            if (query.isPremiumCb()) {
                //保险
                String premium = query.getPremium();
@ -2203,6 +2269,54 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
            }
            CalculateVo calculateVo = resultBean.getData();
            BeanUtil.copyProperties(calculateVo, solutionssVo);
+            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(query.getPolicySid());
+            if(loanFinPolicy != null){
+                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                if(serviceChargeTypeValue != null){
+                    solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                }
+
+            }
+            if(query.isOtherPolicyState()){
+                //验证贷款金额是否不大于最高贷款金额
+                LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
+                if (loanFinOtherPolicy != null) {
+                    if (loanFinOtherPolicy.getMaxLoanAmount() != null && loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
+                        if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
+                            if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        } else {
+                            if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
+                                if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            } else {//maxLoanAmountRat与贷款金额作对比
+                                if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            }
+                        }
+                    } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
+                        if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+
+                    } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                        if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+                    }
+                }
+            }
+
        }
        List<SolutionListVo> formList = getFormList(solutionssVo);
        solutionssVo.setFinanceForms(formList);
@ -2241,7 +2355,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
            }
            isTrue = true;
            //全款且为三方金融
-            if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+            if (StringUtils.isBlank(loanSolutions.getTypeKey())) {//贷款且为担保贷款
                solutionssVo.setShowMore(true);
                solutionssVo.setFactoryDiscountUse("抵利息");
                if (isTrue) {
@ -2260,6 +2374,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                            solutionssVo.setOtherPolicyIsMain(true);
                        }
                    }
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
                }
            } else {
                if ("02".equals(loanSolutions.getTypeKey())) {
@ -2288,6 +2411,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                                solutionssVo.setOtherPolicyIsMain(true);
                            }
                        }
+                        LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                        if(loanFinPolicy != null){
+                            String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                            BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                            solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                            if(serviceChargeTypeValue != null){
+                                solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                            }
+                        }
                    }
                }
            }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
@ -201,5 +201,8 @@ public class AppSolutionVo {
    @ApiModelProperty("拼接的List")
    private List<OrderSolutionListVo> financeForms = new ArrayList<>();

+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
+

 }
--- 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;
 }