修改

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

@@ -1616,6 +1616,13 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         calculateVo.setDownPayAmounts(calculateVo.getLoanDownPay());
         //代收费用合计计算
         BigDecimal proxyTotal = BigDecimal.ZERO;
+        if("01".equals(query.getDealWayKey())){//公司办理
+            if(query.isPremiumCb() && StringUtils.isNotBlank(query.getPremium())){//保险费
+                query.setProxyPremium(query.getPremium());
+            }
+            if(query.isPurchaseTaxCb() && StringUtils.isNotBlank(query.getPurchaseTax())){//购置税
+                query.setProxyPurchasetax(query.getProxyPurchasetax());
+            }
             if (StringUtils.isNotBlank(query.getProxyPremium())) {
                 proxyTotal = proxyTotal.add(new BigDecimal(query.getProxyPremium()));
             }
@@ -1623,6 +1630,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 proxyTotal = proxyTotal.add(new BigDecimal(query.getProxyPurchasetax()));
             }
             calculateVo.setProxyTotal(proxyTotal.toString());
+        }
+
         //应收合计 = 融资首付+贷款保证金+保险保证金+落户保证金+服务费+代收意外险+补车价+上牌费+运管费+其它费用
         BigDecimal receivableTotal = new BigDecimal(BigInteger.ZERO);
         receivableTotal = receivableTotal.add(new BigDecimal(calculateVo.getDownPayAmounts()));
@@ -1681,6 +1690,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         calculateVo.setReceivableTotal(receivableTotal.toString());
         //抵顶费用合计 = 抵顶首年保险费+抵顶购置税
         BigDecimal offsetTotal = new BigDecimal(BigInteger.ZERO);
+        if("02".equals(query.getDealWayKey())){//自行办理
             //抵顶首年保险费
             String offsetPremium = query.getOffsetPremium();
             if (StringUtils.isNotBlank(offsetPremium)) {
@@ -1693,6 +1703,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             offsetTotal = offsetTotal.add(offsetAccessoriesBig);
             calculateVo.setOffsetTotal(offsetTotal.toString());
+        }
+
+
         //实收合计 = 应收合计-抵顶合计
         BigDecimal realTotal = receivableTotal.subtract(offsetTotal);
         calculateVo.setRealTotal(realTotal.toString());
@@ -2363,6 +2376,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 dealWayValue = dealWayValue.append("办理方式选择：").append("-");
             }
             list.add(getValueSpanSize(dealWayValue.toString(), 2, 2, false));
+            if("01".equals(solutionssVo.getDealWayKey())){//公司办理
                 StringBuilder proxyTotalValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionssVo.getProxyTotal())) {
                     proxyTotalValue = proxyTotalValue.append("代收合计：").append(solutionssVo.getProxyTotal());
@@ -2390,6 +2404,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         list.add(getValueSpanSize(proxyPurchasetaxValue.toString(), 1, 0, false));
                     }
                 }
+            }
+
             //应收合计
             StringBuilder receivableTotalValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getReceivableTotal())) {
@@ -2398,8 +2414,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 receivableTotalValue = receivableTotalValue.append("应收合计：").append("-");
             }
             list.add(getValueSpanSize(receivableTotalValue.toString(), 2, 0, true));
-
+            if("02".equals(solutionssVo.getDealWayKey())){//自行办理
-            //抵顶费用合计
+//抵顶费用合计
                 StringBuilder offsetTotalValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionssVo.getOffsetTotal())) {
                     offsetTotalValue = offsetTotalValue.append("抵顶费用合计：").append(solutionssVo.getOffsetTotal());
@@ -2437,6 +2453,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         list.add(getValueSpanSize(offsetAccessoriesValue.toString(), 1, 0, false));
                     }
                 }
+            }
+
             //实收合计
             StringBuilder realTotalValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getRealTotal())) {