From 2c8e5136c04c954291e122779f18537eca2be116 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 19 May 2023 11:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             |  2 +-
 .../loansolutions/LoanSolutionsService.java   | 42 ++++++++++++-------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index eb26555b54..bea6d6fc1c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -731,7 +731,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData();
             if (baseVehicleCertificate != null) {
                 finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
-                finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateSituationValue());
+                finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateStateValue());
             }
             finBillVehicles.add(finBillVehicleDto);
         }
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 ec94cef02b..c130fb92de 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
@@ -191,6 +191,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     return rb.setMsg("请输入保险金额");
                 }
                 loanSolutions.setPremiumCb(1);
+                if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
+                    if(new BigDecimal(dto.getOffsetPremium()).compareTo(new BigDecimal(premium))>0){
+                        return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                    }
+                }
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setPremiumCb(0);
@@ -206,12 +211,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     return rb.setMsg("请输入购置税");
                 }
                 loanSolutions.setPurchaseTaxCb(1);
+                if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
+                    if(new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax))>0){
+                        return rb.setMsg("抵顶购置税不能超过购置税");
+                    }
+                }
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setPurchaseTaxCb(0);
             }
             //是否勾选车损上浮
-            if (dto.isVehDamageFloatCb()) {
+           /* if (dto.isVehDamageFloatCb()) {
                 //车损上浮
                 String vehDamageFloat = dto.getVehDamageFloat();
                 if (StringUtils.isNotBlank(vehDamageFloat)) {
@@ -224,7 +234,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setVehDamageFloatCb(0);
-            }
+            }*/
             loanSolutions.setLoanTotal(loanTotal);
             //产品贷款金额
             BigDecimal loanAmount = new BigDecimal(BigInteger.ZERO);
@@ -509,19 +519,23 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BigDecimal offsetTotal = new BigDecimal(BigInteger.ZERO);
             //抵顶首年保险费
             String offsetPremium = dto.getOffsetPremium();
-            if (StringUtils.isNotBlank(offsetPremium)) {
-                offsetTotal = offsetTotal.add(new BigDecimal(offsetPremium));
-                loanSolutionsDetail.setOffsetPremium(new BigDecimal(offsetPremium));
-            } else {
-                loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+            if(dto.isPremiumCb()){
+                if (StringUtils.isNotBlank(offsetPremium)) {
+                    offsetTotal = offsetTotal.add(new BigDecimal(offsetPremium));
+                    loanSolutionsDetail.setOffsetPremium(new BigDecimal(offsetPremium));
+                } else {
+                    loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+                }
             }
-            //抵顶购置税
-            String offsetPurchasetax = dto.getOffsetPurchasetax();
-            if (StringUtils.isNotBlank(offsetPurchasetax)) {
-                offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
-                loanSolutionsDetail.setOffsetPurchasetax(new BigDecimal(offsetPurchasetax));
-            } else {
-                loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+            if (dto.isPurchaseTaxCb()) {
+                //抵顶购置税
+                String offsetPurchasetax = dto.getOffsetPurchasetax();
+                if (StringUtils.isNotBlank(offsetPurchasetax)) {
+                    offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
+                    loanSolutionsDetail.setOffsetPurchasetax(new BigDecimal(offsetPurchasetax));
+                } else {
+                    loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+                }
             }
             //实收合计 = 应收合计-抵顶合计
             BigDecimal realTotal = receivableTotal.subtract(offsetTotal);