From 454b5ff1aa092e275e4ea0df7c13c834ef75217c Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 31 Mar 2023 13:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/order/AppOrderDetailsVo.java          |   3 +
 .../bussalesorder/BusSalesOrderService.java   | 143 ++++++++++--------
 .../loansolutions/LoanSolutionsService.java   |  19 +--
 .../saleOrders/order/OrderDetailsVo.java      |   3 +
 .../api/risk/solutions/AppSolutionsDto.java   |   2 +
 5 files changed, 97 insertions(+), 73 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
index 9d97445fc7..da27f5468d 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
@@ -129,5 +129,8 @@ public class AppOrderDetailsVo implements Vo {
     @ApiModelProperty("金融方案费用明细")
     private String detailLoanSolutions;
 
+    @ApiModelProperty("是否有金融方案")
+    private boolean finState;
+
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index ec915028fc..312dfdd01b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -3271,6 +3271,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setDepositInfo(depositInfo);
         }
         /****************************金融方案***************************************/
+        if("2".equals(busSalesOrder.getPayTypeKey())){
+            vo.setFinState(true);
+        }else{
+            if("1".equals(busSalesOrder.getFinancePlan())){
+                vo.setFinState(false);
+            }else{
+                vo.setFinState(true);
+            }
+        }
         vo = selectSolution(vo, sid);
         return rb.success().setData(vo);
     }
@@ -3453,37 +3462,43 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (solutionsDetailsVo.isOtherPolicyState()) {
                     //其它融名称
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyName())) {
-                        otherLoanSolutions = loanSolutions.append("其它融名称：").append(solutionsDetailsVo.getOtherPolicyName());
+                        otherLoanSolutions = otherLoanSolutions.append("其它融名称：").append(solutionsDetailsVo.getOtherPolicyName());
 
                     } else {
-                        otherLoanSolutions = loanSolutions.append("其它融名称：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("其它融名称：").append("-");
                     }
                     //贷款金额
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyAmount())) {
-                        otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append(solutionsDetailsVo.getOtherPolicyAmount());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("贷款金额：").append(solutionsDetailsVo.getOtherPolicyAmount());
 
                     } else {
-                        otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("贷款金额：").append("-");
                     }
                     //期数
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyPeriod())) {
-                        otherLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getOtherPolicyPeriod());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getOtherPolicyPeriod());
 
                     } else {
-                        otherLoanSolutions = loanSolutions.append("、").append("期数：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("期数：").append("-");
                     }
                     //月还金额
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyMonthlyRepay())) {
-                        otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getOtherPolicyMonthlyRepay());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getOtherPolicyMonthlyRepay());
 
                     } else {
-                        otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("月还金额：").append("-");
                     }
                     //利息总额
+                    if(StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyInterest())){
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getOtherPolicyInterest());
+                    }else{
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("利息总额：").append("-");
+                    }
+                    //年利率
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyYearRatio())) {
-                        otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
                     } else {
-                        otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append("-");
                     }
                 } else {
                     otherLoanSolutions = otherLoanSolutions.append("-");
@@ -3492,169 +3507,169 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //==========================方案汇总
                 //融资首付
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanDownPay())) {
-                    allLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getLoanDownPay());
+                    allLoanSolutions = allLoanSolutions.append("融资首付：").append(solutionsDetailsVo.getLoanDownPay());
 
                 } else {
-                    allLoanSolutions = loanSolutions.append("融资首付：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("融资首付：").append("-");
                 }
                 //总贷款金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanAmountTotal())) {
-                    allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append(solutionsDetailsVo.getLoanAmountTotal());
+                    allLoanSolutions = allLoanSolutions.append("、").append("总贷款金额：").append(solutionsDetailsVo.getLoanAmountTotal());
 
                 } else {
-                    allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("、").append("总贷款金额：").append("-");
                 }
                 //期数
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getPeriod())) {
-                    allLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getPeriod());
+                    allLoanSolutions = allLoanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getPeriod());
 
                 } else {
-                    allLoanSolutions = loanSolutions.append("、").append("期数：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("、").append("期数：").append("-");
                 }
                 //月还金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getMonthlyRepay())) {
-                    allLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getMonthlyRepay());
+                    allLoanSolutions = allLoanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getMonthlyRepay());
                 } else {
-                    allLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("、").append("月还金额：").append("-");
                 }
                 //利息总额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getInterest())) {
-                    allLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getInterest());
+                    allLoanSolutions = allLoanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getInterest());
                 } else {
-                    allLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("、").append("利息总额：").append("-");
                 }
                 //预计首期还款日
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getReturnTime())) {
-                    allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append(solutionsDetailsVo.getReturnTime());
+                    allLoanSolutions = allLoanSolutions.append("、").append("预计首期还款日：").append(solutionsDetailsVo.getReturnTime());
                 } else {
-                    allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append("-");
+                    allLoanSolutions = allLoanSolutions.append("、").append("预计首期还款日：").append("-");
                 }
                 //=========================应收明细
                 //融资首付
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmounts())) {
-                    detailLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getDownPayAmounts());
+                    detailLoanSolutions = detailLoanSolutions.append("融资首付：").append(solutionsDetailsVo.getDownPayAmounts());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("融资首付：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("融资首付：").append("-");
                 }
                 //贷款保证金
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmounts())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmounts());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmounts());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("贷款保证金：").append("-");
                 }
                 //保险保证金
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositPremium())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append(solutionsDetailsVo.getDepositPremium());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("保险保证金：").append(solutionsDetailsVo.getDepositPremium());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("保险保证金：").append("-");
                 }
                 //落户保证金
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositSettle())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append(solutionsDetailsVo.getDepositSettle());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("落户保证金：").append(solutionsDetailsVo.getDepositSettle());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("落户保证金：").append("-");
                 }
                 //服务费
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("服务费：").append(solutionsDetailsVo.getServiceAmount());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("服务费：").append(solutionsDetailsVo.getServiceAmount());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("服务费：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("服务费：").append("-");
                 }
                 //代收意外险
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyAccidentPremium())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append(solutionsDetailsVo.getProxyAccidentPremium());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收意外险：").append(solutionsDetailsVo.getProxyAccidentPremium());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收意外险：").append("-");
                 }
                 //上牌费
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getRegisterAmount())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("运管费：").append(solutionsDetailsVo.getRegisterAmount());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("上牌费：").append(solutionsDetailsVo.getRegisterAmount());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("运管费：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("上牌费：").append("-");
                 }
                 //运管费
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOperationAmount())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append(solutionsDetailsVo.getPolicyName());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("运管费：").append(solutionsDetailsVo.getOperationAmount());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("运管费：").append("-");
                 }
                 //补车价
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getVehOtherPrice())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("补车价：").append(solutionsDetailsVo.getVehOtherPrice());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("补车价：").append(solutionsDetailsVo.getVehOtherPrice());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("补车价：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("补车价：").append("-");
                 }
                 //其它费用
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmount())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append(solutionsDetailsVo.getOtherAmount());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用：").append(solutionsDetailsVo.getOtherAmount());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用：").append("-");
                 }
                 //其它费用说明
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmountRemark())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append(solutionsDetailsVo.getOtherAmountRemark());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用说明：").append(solutionsDetailsVo.getOtherAmountRemark());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用说明：").append("-");
                 }
                 //办理方式选择
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDealWay())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append(solutionsDetailsVo.getDealWay());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("办理方式选择：").append(solutionsDetailsVo.getDealWay());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("办理方式选择：").append("-");
                 }
                 //代收首年保险费
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPremium())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append(solutionsDetailsVo.getProxyPremium());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收首年保险费：").append(solutionsDetailsVo.getProxyPremium());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收首年保险费：").append("-");
                 }
                 //代收购置税
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPurchasetax())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append(solutionsDetailsVo.getProxyPurchasetax());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收购置税：").append(solutionsDetailsVo.getProxyPurchasetax());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("代收购置税：").append("-");
                 }
                 //应收合计
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getReceivableTotal())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append(solutionsDetailsVo.getReceivableTotal());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("应收合计：").append(solutionsDetailsVo.getReceivableTotal());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("应收合计：").append("-");
                 }
                 //抵顶费用合计
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetTotal())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append(solutionsDetailsVo.getOffsetTotal());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶费用合计：").append(solutionsDetailsVo.getOffsetTotal());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶费用合计：").append("-");
                 }
                 //抵顶首年保险费
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPremium())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append(solutionsDetailsVo.getOffsetPremium());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶首年保险费：").append(solutionsDetailsVo.getOffsetPremium());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶首年保险费：").append("-");
                 }
                 //抵顶购置税
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPurchasetax())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append(solutionsDetailsVo.getOffsetPurchasetax());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶购置税：").append(solutionsDetailsVo.getOffsetPurchasetax());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶购置税：").append("-");
                 }
                 //实收合计
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append(solutionsDetailsVo.getRealTotal());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("实收合计：").append(solutionsDetailsVo.getRealTotal());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("实收合计：").append("-");
                 }
                 //车辆总价
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getVehTotalPrice())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append(solutionsDetailsVo.getVehTotalPrice());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("车辆总价：").append(solutionsDetailsVo.getVehTotalPrice());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("车辆总价：").append("-");
                 }
                 //名义留购价
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getNominalPrice())) {
-                    detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append(solutionsDetailsVo.getNominalPrice());
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("名义留购价：").append(solutionsDetailsVo.getNominalPrice());
                 } else {
-                    detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append("-");
+                    detailLoanSolutions = detailLoanSolutions.append("、").append("名义留购价：").append("-");
                 }
 
 
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 253049b273..e541de4838 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
@@ -15,6 +15,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -77,7 +78,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         }
         return rb.success().setData(solutionsDetailsVo);
     }
-
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean saveDto(SolutionsDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //查询金融方案
@@ -204,7 +205,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 downPayAmount = downPayAmount.add(new BigDecimal(dto.getDownPayAmount()));
                 //首付款比例
                 String downPayRatio = "";
-                BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
                 downPayRatio = downPayRatio1.toString() + "%";
                 //产品贷款金额 = 融资项目总额-首付金额
                 loanAmount = loanTotal.subtract(downPayAmount);
@@ -228,7 +229,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BigDecimal bondAmount = new BigDecimal(dto.getBondAmount());
                 //贷款保证金比例
                 String bondRatio = "";
-                BigDecimal bondRatio1 = bondAmount.divide(loanAmount,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal bondRatio1 = bondAmount.divide(loanAmount,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
                 bondRatio = bondRatio1.toString() + "%";
                 loanSolutions.setBondAmount(bondAmount);
                 loanSolutions.setBondRatio(bondRatio);
@@ -266,7 +267,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String loanInterest = dto.getLoanInterest();
             if (StringUtils.isNotBlank(loanInterest)) {
                 loanSolutions.setLoanInterest(new BigDecimal(loanInterest));
-                interest.add(new BigDecimal(loanInterest));
+                interest = interest.add(new BigDecimal(loanInterest));
             } else {
                 loanSolutions.setLoanInterest(BigDecimal.ZERO);
             }
@@ -377,11 +378,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BigDecimal downPayAmounts = new BigDecimal(BigInteger.ZERO);
             downPayAmounts = downPayAmounts.add(downPayAmount).subtract(otherPolicyAmount1);
             loanSolutionsDetail.setDownPayAmounts(downPayAmounts);
+            receivableTotal = receivableTotal.add(downPayAmounts);
             //贷款保证金
-            String bondAmounts = dto.getBondAmounts();
-            if (StringUtils.isNotBlank(bondAmounts)) {
-                receivableTotal = receivableTotal.add(new BigDecimal(bondAmounts));
-                loanSolutionsDetail.setBondAmounts(new BigDecimal(bondAmounts));
+            if (StringUtils.isNotBlank(dto.getBondAmount())) {
+                receivableTotal = receivableTotal.add(new BigDecimal(dto.getBondAmount()));
+                loanSolutionsDetail.setBondAmounts(new BigDecimal(dto.getBondAmount()));
             } else {
                 loanSolutionsDetail.setBondAmounts(BigDecimal.ZERO);
             }
@@ -396,7 +397,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //落户保证金
             String depositSettle = dto.getDepositSettle();
             if (StringUtils.isNotBlank(depositSettle)) {
-                receivableTotal = receivableTotal.add(new BigDecimal(depositPremium));
+                receivableTotal = receivableTotal.add(new BigDecimal(depositSettle));
                 loanSolutionsDetail.setDepositSettle(new BigDecimal(depositSettle));
             } else {
                 loanSolutionsDetail.setDepositSettle(BigDecimal.ZERO);
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
index ae0f7b0b1e..7591c219dd 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
@@ -101,5 +101,8 @@ public class OrderDetailsVo implements Vo {
     @ApiModelProperty("金融方案费用明细")
     private String detailLoanSolutions;
 
+    @ApiModelProperty("是否有金融方案")
+    private boolean finState;
+
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
index 2e2286459a..8ce4cc677a 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
@@ -83,6 +83,8 @@ public class AppSolutionsDto implements Dto {
     private String otherPolicyMonthlyRepay;
     @ApiModelProperty("其它融利息总额")
     private String otherPolicyInterest;
+    @ApiModelProperty("其它融年利率")
+    private String otherPolicyYearRatio;
 
     @ApiModelProperty("'融资首付")
     private String loanDownPay;