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 011fde7d3b..5f7cb39939 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
@@ -4460,10 +4460,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //首付比例
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("首付比例：").append(solutionsDetailsVo.getDownPayRatio());
+                    loanSolutions = loanSolutions.append("、").append("首付比例（%）：").append(solutionsDetailsVo.getDownPayRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("首付比例：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("首付比例（%）：").append("-");
                 }
                 //首付金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmount())) {
@@ -4488,10 +4488,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //贷款保证金比例
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getBondRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append(solutionsDetailsVo.getBondRatio());
+                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例（%）：").append(solutionsDetailsVo.getBondRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("贷款保证金比例（%）：").append("-");
                 }
                 //贷款保证金
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmount())) {
@@ -4509,10 +4509,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 //年利率
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicyYearRatio())) {
-                    loanSolutions = loanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getPolicyYearRatio());
+                    loanSolutions = loanSolutions.append("、").append("年利率（%）：").append(solutionsDetailsVo.getPolicyYearRatio());
 
                 } else {
-                    loanSolutions = loanSolutions.append("、").append("年利率：").append("-");
+                    loanSolutions = loanSolutions.append("、").append("年利率（%）：").append("-");
                 }
                 //月还金额
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanPayMoney())) {
@@ -4573,9 +4573,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     //年利率
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyYearRatio())) {
-                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率（%）：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
                     } else {
-                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append("-");
+                        otherLoanSolutions = otherLoanSolutions.append("、").append("年利率（%）：").append("-");
                     }
                 }
 
@@ -5387,7 +5387,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
-            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
+            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 6663fb162e..b8e2ea3e76 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1963,6 +1963,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                                 leftAll = leftAll.add(singleFinalPrice);
                                                 if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
                                                     leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
+                                                }else{
+                                                    leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
                                                 }
                                                 if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
                                                     leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java
index 1d72fc55f8..0a4e58c559 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java
@@ -45,8 +45,8 @@ public class CalculateQuery {
     private String loanAmount;
     @ApiModelProperty("贷款期数")
     private String loanPeriod;
-    @ApiModelProperty("贷款保证金比例")
-    private String bondRatio;
+/*    @ApiModelProperty("贷款保证金比例")
+    private String bondRatio;*/
     @ApiModelProperty("贷款保证金金额")
     private String bondAmount;
     @ApiModelProperty("厂家贴息")
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 22ac5693d1..22f2588617 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
@@ -327,7 +327,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //首付款比例
                 String downPayRatio = "";
                 BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                downPayRatio = downPayRatio1.toString() + "%";
+                downPayRatio = downPayRatio1.toString() /*+ "%"*/;
                 //产品贷款金额 = 融资项目总额-首付金额
                 loanAmount = loanTotal.subtract(downPayAmount);
                 loanSolutions.setDownPayAmount(downPayAmount);
@@ -351,7 +351,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //贷款保证金比例
                 String bondRatio = "";
                 BigDecimal bondRatio1 = bondAmount.divide(loanAmount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                bondRatio = bondRatio1.toString() + "%";
+                bondRatio = bondRatio1.toString() /*+ "%"*/;
                 loanSolutions.setBondAmount(bondAmount);
                 loanSolutions.setBondRatio(bondRatio);
             } else {
@@ -457,7 +457,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //实际首付比例
                 String downPayAmountsRatio = "";
                 BigDecimal downPayAmountsRatio1 = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                downPayAmountsRatio = downPayAmountsRatio1.toString() + "%";
+                downPayAmountsRatio = downPayAmountsRatio1.toString() /*+ "%"*/;
                 loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
 
 
@@ -483,7 +483,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //实际首付比例
                 String downPayAmountsRatio = "";
                 BigDecimal downPayAmountsRatio1 = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-                downPayAmountsRatio = downPayAmountsRatio1.toString() + "%";
+                downPayAmountsRatio = downPayAmountsRatio1.toString() /*+ "%"*/;
                 loanSolutionsOtherpolicy.setDownPayAmountsRatio(downPayAmountsRatio);
                 //期数 = 其它融期数拼接剩余期数（6/18）
                 int i = Integer.valueOf(loanPeriod) - ii;
@@ -766,6 +766,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             //保存金融方案
             loanSolutions = new LoanSolutions();
+            loanSolutions.setSaleOrderState(1);
+            if (StringUtils.isNotBlank(dto.getBusSid())) {
+                loanSolutions.setSalesOrderSid(dto.getBusSid());
+            }
+            BeanUtil.copyProperties(dto, loanSolutions, "sid");
             //根据产品政策查询是否是自营非担保
             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(dto.getPolicySid());
             if (loanFinPolicy != null) {
@@ -774,11 +779,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     loanSolutions.setType("自营非担保");
                 }
             }
-            loanSolutions.setSaleOrderState(1);
-            if (StringUtils.isNotBlank(dto.getBusSid())) {
-                loanSolutions.setSalesOrderSid(dto.getBusSid());
-            }
-            BeanUtil.copyProperties(dto, loanSolutions, "sid");
             //主车发票价
             loanSolutions.setMainVehicleAmount(new BigDecimal(mainVehicleAmount));
             //是否勾选融资票据
@@ -1269,6 +1269,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 return rb.setMsg("请选择其他融");
             }
             String otherPolicyYearRatio = query.getOtherPolicyYearRatio();
+            if(otherPolicyYearRatio.contains("%")){
+                otherPolicyYearRatio = otherPolicyYearRatio.replaceAll("%", "");
+            }
             String otherPolicyAmount = query.getOtherPolicyAmount();
             if (StringUtils.isBlank(otherPolicyAmount)) {
                 return rb.setMsg("其他融贷款金额不能为空");
@@ -1280,7 +1283,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //总贷款金额的计算
             loanAmountTotal = loanAmountTotal.add(new BigDecimal(otherPolicyAmount));
             //根据年利率和期数、贷款金额计算月还
-            BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyPeriod).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
+            BigDecimal otherPolicyMonthlyRepay = calculatePMT(new BigDecimal(otherPolicyYearRatio).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING).doubleValue(), new BigDecimal(otherPolicyPeriod).doubleValue(), new BigDecimal(otherPolicyAmount).doubleValue());
             //根据月还计算利息总额=月还金额 乘以 期数 减去 本金
             BigDecimal otherPolicyInterest = otherPolicyMonthlyRepay.multiply(new BigDecimal(otherPolicyPeriod)).subtract(new BigDecimal(otherPolicyAmount));
             //四舍五入取整数
@@ -1685,10 +1688,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //贷款保证金比例
             StringBuilder bondRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getBondRatio())) {
-                bondRatioValue = bondRatioValue.append("贷款保证金比例：").append(solutionssVo.getBondRatio());
+                bondRatioValue = bondRatioValue.append("贷款保证金比例（%）：").append(solutionssVo.getBondRatio());
 
             } else {
-                bondRatioValue = bondRatioValue.append("贷款保证金比例：").append("-");
+                bondRatioValue = bondRatioValue.append("贷款保证金比例（%）：").append("-");
             }
             list.add(getValueSpanSize(bondRatioValue.toString(), 1, 0, false));
             //贷款保证金
@@ -1719,10 +1722,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //年利率
             StringBuilder policyYearRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getPolicyYearRatio())) {
-                policyYearRatioValue = policyYearRatioValue.append("年利率：").append(solutionssVo.getPolicyYearRatio());
+                policyYearRatioValue = policyYearRatioValue.append("年利率（%）：").append(solutionssVo.getPolicyYearRatio());
 
             } else {
-                policyYearRatioValue = policyYearRatioValue.append("年利率：").append("-");
+                policyYearRatioValue = policyYearRatioValue.append("年利率（%）：").append("-");
             }
             list.add(getValueSpanSize(policyYearRatioValue.toString(), 1, 0, false));
             //利息总额
@@ -1776,9 +1779,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 //年利率
                 StringBuilder otherPolicyYearRatioValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyYearRatio())) {
-                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append(solutionssVo.getOtherPolicyYearRatio());
+                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率（%）：").append(solutionssVo.getOtherPolicyYearRatio());
                 } else {
-                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append("-");
+                    otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率（%）：").append("-");
                 }
                 list.add(getValueSpanSize(otherPolicyYearRatioValue.toString(), 1, 0, false));
                 //利息总额
@@ -1811,9 +1814,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             list.add(getValueSpanSize(loanDownPayValue.toString(), 1, 0, false));
             StringBuilder downPayAmountsRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getDownPayAmountsRatio())) {
-                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append(solutionssVo.getDownPayAmountsRatio());
+                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例（%）：").append(solutionssVo.getDownPayAmountsRatio());
             } else {
-                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append("-");
+                downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例（%）：").append("-");
             }
             list.add(getValueSpanSize(downPayAmountsRatioValue.toString(), 1, 0, false));
             //总贷款金额