金融方案优化

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java

@@ -169,4 +169,12 @@ public class AppCrmSolutions {
     private String serviceChargeTypeValue;
 
     private String modelSid;
+
+    @ApiModelProperty("实际贴息")
+    private String actualDiscount;
+    @ApiModelProperty("其他融实际贴息")
+    private String otherActualDiscount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java

@@ -189,5 +189,8 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java

@@ -180,5 +180,8 @@ public class SolutionssVo implements Vo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java

@@ -160,4 +160,7 @@ public class LoanTemplateSolutionsVo implements Vo {
     private String actualDiscount;
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -82,6 +82,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (loanSolutionsDetail != null) {
                 BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
             }
+            if(StringUtils.isNotBlank(loanSolutions.getPolicySid())){
+                LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+                if(loanFinPolicy != null){
+                    solutionsDetailsVo.setBondTypeKey(loanFinPolicy.getBondTypeKey());
+                }
+            }
         }
         //根据销售订单sid查询销售订单的信息
         ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails(saleOrderSid);
@@ -1186,6 +1192,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (serviceChargeTypeValue != null) {
                 solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
             }
+            solutionsDetailsVo.setBondTypeKey(loanFinPolicy.getBondTypeKey());
         }
         return rb.success().setData(solutionsDetailsVo);
     }
@@ -1752,6 +1759,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
             }
             isTrue = true;
+            if(StringUtils.isNotBlank(loanSolutions.getPolicySid())){
+                LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+                if(loanFinPolicy != null){
+                    solutionssVo.setBondTypeKey(loanFinPolicy.getBondTypeKey());
+                }
+            }
         }
         //查询销售订单的状态
         ResultBean<BusSalesOrdersVo> resultBean = busSalesOrderFeign.getSalesOrderOne(busSid);
@@ -2482,6 +2495,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BeanUtil.copyProperties(calculateVo, solutionssVo);
             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(query.getPolicySid());
             if (loanFinPolicy != null) {
+                solutionssVo.setBondTypeKey(loanFinPolicy.getBondTypeKey());
                 String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                 BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                 solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
@@ -2580,6 +2594,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (loanSolutions != null) {
             solutionssVo = new SolutionssVo();
             BeanUtil.copyProperties(loanSolutions, solutionssVo);
+            if(StringUtils.isNotBlank(loanSolutions.getPolicySid())){
+                LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+                if(loanFinPolicy != null){
+                    solutionssVo.setBondTypeKey(loanFinPolicy.getBondTypeKey());
+                }
+            }
             if (loanSolutions.getTrailerAmount() != null) {
                 solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
             }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java

@@ -214,5 +214,8 @@ public class AppSolutionVo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java

@@ -187,4 +187,7 @@ public class AppSolutionsDetailsVo implements Vo {
     private String actualDiscount;
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java

@@ -45,4 +45,7 @@ public class ExtraVo implements Vo {
     private String nominalPrice;
     @ApiModelProperty("单车意外险")
     private String vehAccidentAmount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }