优化

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

@@ -1053,11 +1053,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         } else {
                             solutionsDetailsVo.setShowMore(true);
                             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
-                            if(loanFinPolicy != null){
+                            if (loanFinPolicy != null) {
                                 String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                                 BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                                 solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                                if(serviceChargeTypeValue != null){
+                                if (serviceChargeTypeValue != null) {
                                     solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                                 }
                             }
@@ -1068,11 +1068,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionsDetailsVo.setShowMore(true);
                     LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
-                    if(loanFinPolicy != null){
+                    if (loanFinPolicy != null) {
                         String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                         BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                         solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                        if(serviceChargeTypeValue != null){
+                        if (serviceChargeTypeValue != null) {
                             solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                         }
                     }
@@ -1173,11 +1173,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
         }
         LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
-        if(loanFinPolicy != null){
+        if (loanFinPolicy != null) {
             String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
             BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
             solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-            if(serviceChargeTypeValue != null){
+            if (serviceChargeTypeValue != null) {
                 solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
             }
         }
@@ -1262,7 +1262,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 if (StringUtils.isNotBlank(premium)) {
                     loanTotal = loanTotal.add(new BigDecimal(premium));
                 }
-            }else{
+            } else {
                 if (StringUtils.isNotBlank(premium)) {
                     vehTotalPrice = vehTotalPrice.add(new BigDecimal(premium));
                 }
@@ -1271,7 +1271,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 if (StringUtils.isNotBlank(purchaseTax)) {
                     loanTotal = loanTotal.add(new BigDecimal(purchaseTax));
                 }
-            }else{
+            } else {
                 if (StringUtils.isNotBlank(purchaseTax)) {
                     vehTotalPrice = vehTotalPrice.add(new BigDecimal(purchaseTax));
                 }
@@ -1384,7 +1384,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString());
         //
         BigDecimal downPayRatioLeast = loanFinPolicy.getDownPayRatioLeast();
-        if(downPayAmountsRatio.compareTo(downPayRatioLeast)<0){
+        if (downPayAmountsRatio.compareTo(downPayRatioLeast) < 0) {
             return rb.setMsg("实际首付比例不能低于产品政策中的最低首付比例");
         }
         //总贷款金额
@@ -1404,7 +1404,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             } else {
                 monthlyRepay = loanPayMoneyAll.toString() + "/" + calculateVo.getLoanPayMoney();
             }
-        }else{
+        } else {
             monthlyRepay = loanPayMoneyAll.toString();
         }
 
@@ -1626,11 +1626,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             solutionssVo.setShowMore(true);
                             solutionssVo.setFactoryDiscountUse("抵利息");
                             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
-                            if(loanFinPolicy != null){
+                            if (loanFinPolicy != null) {
                                 String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                                 BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                                 solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                                if(serviceChargeTypeValue != null){
+                                if (serviceChargeTypeValue != null) {
                                     solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                                 }
                             }
@@ -1659,11 +1659,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     solutionssVo.setShowMore(true);
                     solutionssVo.setFactoryDiscountUse("抵利息");
                     LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
-                    if(loanFinPolicy != null){
+                    if (loanFinPolicy != null) {
                         String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                         BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                         solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                        if(serviceChargeTypeValue != null){
+                        if (serviceChargeTypeValue != null) {
                             solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                         }
                     }
@@ -1741,8 +1741,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //融资票据
             StringBuilder accessoriesAmountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getAccessoriesAmount())) {
+                if(!solutionssVo.isAccessoriesAmountCb()){
+                    accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append("0");
+                }else{
                     accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append(solutionssVo.getAccessoriesAmount());
-
+                }
             } else {
                 accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append("-");
             }
@@ -1750,8 +1753,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //挂车
             StringBuilder trailerAmountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getTrailerAmount())) {
+                if(!solutionssVo.isTrailerAmountCb()){
+                    trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append("0");
+                }else{
                     trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append(solutionssVo.getTrailerAmount());
-
+                }
             } else {
                 trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append("-");
             }
@@ -1759,8 +1765,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //保险
             StringBuilder premiumValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getPremium())) {
+                if (!solutionssVo.isPremiumCb()) {
+                    premiumValue = premiumValue.append("\t").append("保险：").append("0");
+                }else{
                     premiumValue = premiumValue.append("\t").append("保险：").append(solutionssVo.getPremium());
-
+                }
             } else {
                 premiumValue = premiumValue.append("\t").append("保险：").append("-");
             }
@@ -1768,7 +1777,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //购置税
             StringBuilder purchaseTaxValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getPurchaseTax())) {
+                if(!solutionssVo.isPurchaseTaxCb()){
+                    purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append("0");
+                }else{
                     purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append(solutionssVo.getPurchaseTax());
+                }
             } else {
                 purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append("-");
             }
@@ -1777,7 +1790,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             StringBuilder downPayRatioValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getDownPayRatio())) {
                 downPayRatioValue = downPayRatioValue.append("首付比例(%)：").append(solutionssVo.getDownPayRatio());
-
             } else {
                 downPayRatioValue = downPayRatioValue.append("首付比例(%)：").append("-");
             }
@@ -1786,7 +1798,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             StringBuilder downPayAmountValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getDownPayAmount())) {
                 downPayAmountValue = downPayAmountValue.append("首付金额：").append(solutionssVo.getDownPayAmount());
-
             } else {
                 downPayAmountValue = downPayAmountValue.append("首付金额：").append("-");
             }
@@ -2237,8 +2248,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         SolutionssVo solutionssVo = new SolutionssVo();
         BeanUtil.copyProperties(query, solutionssVo);
         if (query.isShowMore()) {
-
-
             if (query.isPremiumCb()) {
                 //保险
                 String premium = query.getPremium();
@@ -2288,16 +2297,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             CalculateVo calculateVo = resultBean.getData();
             BeanUtil.copyProperties(calculateVo, solutionssVo);
             LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(query.getPolicySid());
-            if(loanFinPolicy != null){
+            if (loanFinPolicy != null) {
                 String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                 BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                 solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                if(serviceChargeTypeValue != null){
+                if (serviceChargeTypeValue != null) {
                     solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                 }
 
             }
-            if(query.isOtherPolicyState()){
+            if (query.isOtherPolicyState()) {
                 //验证贷款金额是否不大于最高贷款金额
                 LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
                 if (loanFinOtherPolicy != null) {
@@ -2393,11 +2402,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         }
                     }
                     LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
-                    if(loanFinPolicy != null){
+                    if (loanFinPolicy != null) {
                         String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                         BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                         solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                        if(serviceChargeTypeValue != null){
+                        if (serviceChargeTypeValue != null) {
                             solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                         }
                     }
@@ -2430,11 +2439,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             }
                         }
                         LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
-                        if(loanFinPolicy != null){
+                        if (loanFinPolicy != null) {
                             String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
                             BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
                             solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
-                            if(serviceChargeTypeValue != null){
+                            if (serviceChargeTypeValue != null) {
                                 solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
                             }
                         }