From 05f5ce0016ce64f0f23edc28fd8c9453fa49599a Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 8 Nov 2023 11:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/crmvehicledemand/AppCrmSolutions.java |  8 ++++++++
 .../loansolutions/app/SolutionsDetailsVo.java |  3 +++
 .../api/loansolutions/app/SolutionssVo.java   |  3 +++
 .../loantemplate/LoanTemplateSolutionsVo.java |  3 +++
 .../loansolutions/LoanSolutionsService.java   | 20 +++++++++++++++++++
 .../api/risk/solutions/AppSolutionVo.java     |  3 +++
 .../risk/solutions/AppSolutionsDetailsVo.java |  3 +++
 .../terminal/api/risk/solutions/ExtraVo.java  |  3 +++
 8 files changed, 46 insertions(+)

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 f2eb6b6ffd..8ea9e64bdb 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
@@ -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;
 }
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 cd45aee7b1..7fe6d878a6 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
@@ -189,5 +189,8 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }
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 e4d4ef29cc..6d93839e6a 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
@@ -180,5 +180,8 @@ public class SolutionssVo implements Vo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }
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 234566ec4a..ed75da7afd 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
@@ -160,4 +160,7 @@ public class LoanTemplateSolutionsVo implements Vo {
     private String actualDiscount;
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }
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 c04aea3c1b..a29d69d3a4 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
@@ -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());
             }
diff --git 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
index bed01a8b9d..b77a19b41a 100644
--- 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
@@ -214,5 +214,8 @@ public class AppSolutionVo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
+
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
index 8c9c89d1be..5cd9f1dc96 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
+++ b/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;
 }
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 550ad909e1..a27fca904a 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
@@ -45,4 +45,7 @@ public class ExtraVo implements Vo {
     private String nominalPrice;
     @ApiModelProperty("单车意外险")
     private String vehAccidentAmount;
+
+    @ApiModelProperty("保证金类型01固定，02敞口")
+    private String bondTypeKey;
 }