From e21880b2170de54449f8769496b02d0a1b53dab7 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 15 Apr 2024 17:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=87=91?=
 =?UTF-8?q?=E8=9E=8D=E6=96=B9=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/SolutionsDetailsssVo.java   |  3 ++
 .../bussalesorder/BusSalesOrderService.java   | 16 +++++++++-
 .../api/loansolutions/SolutionDetailsDto.java |  3 ++
 .../loansolutions/app/SolutionsDetailsVo.java |  3 ++
 .../api/loansolutions/app/SolutionssDto.java  |  3 ++
 .../api/loansolutions/app/SolutionssVo.java   |  3 ++
 .../calculate/CalculateQuery.java             |  2 ++
 .../loansolutions/calculate/CalculateVo.java  |  3 ++
 .../LoanSolutionsDetail.java                  |  3 ++
 .../loansolutions/LoanSolutionsService.java   | 30 ++++++++++++++++++-
 .../api/risk/solutions/AppSolutionVo.java     |  3 ++
 .../risk/solutions/AppSolutionsDetailsVo.java |  3 ++
 .../api/risk/solutions/AppSolutionssDto.java  |  3 ++
 13 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
index bbcec9dcaa..215a84bf52 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
@@ -175,4 +175,7 @@ public class SolutionsDetailsssVo {
 
     private String bondTypeKey;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 }
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 3f772a3882..b5c3c9b2c3 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
@@ -1876,7 +1876,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         } else {
                             vo.setMain(true);
                         }
-                    }else{
+                    } else {
                         vo.setMain(true);
                     }
                 }
@@ -3284,6 +3284,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
                         return rb.setMsg("金融方案中实收金额小于单台订金");
                     }
+                    BigDecimal AmountAll = BigDecimal.ZERO;
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getMainVehicleAmount())) {
+                        //主车发票价
+                        AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()));
+                    }
+                    if (solutionsDetailsVo.isAccessoriesAmountCb()) {//包含配件
+                        if (StringUtils.isNotBlank(solutionsDetailsVo.getAccessoriesAmount())) {
+                            AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
+                        }
+                    }
+                    //判断成交价与主车发票价和配件之和
+                    if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {
+                        return rb.setMsg("主车发票价与配件之和不能小于订单成交价");
+                    }
                 } else {
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
                         if (!"02".equals(solutionsDetailsVo.getTypeKey())) {
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
index bdea2f8a67..ccf492c335 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java
@@ -172,5 +172,8 @@ public class SolutionDetailsDto implements Dto {
 
     private int saleOrderState = 0;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
index 7fe6d878a6..ef0f603fec 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
@@ -192,5 +192,8 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("保证金类型01固定，02敞口")
     private String bondTypeKey;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
index b9e8e9cf6d..e22c9bb0af 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java
@@ -171,4 +171,7 @@ public class SolutionssDto implements Dto {
     private String otherActualDiscount;
 
     private int saleOrderState;
+
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
index 6d93839e6a..3d72963670 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
@@ -183,5 +183,8 @@ public class SolutionssVo implements Vo {
     @ApiModelProperty("保证金类型01固定，02敞口")
     private String bondTypeKey;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 
 }
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 f330ee20aa..020f5f0b3c 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
@@ -101,4 +101,6 @@ public class CalculateQuery {
     private String offsetPremium;
     @ApiModelProperty("抵顶购置税")
     private String offsetPurchasetax;
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
index 43dd99af79..eb7e5e0f7e 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java
@@ -64,5 +64,8 @@ public class CalculateVo {
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
index d75e8620ad..899a53b581 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
@@ -77,6 +77,9 @@ public class LoanSolutionsDetail extends BaseEntity {
     @ApiModelProperty("代收合计")
     private BigDecimal proxyTotal;
 
+    @ApiModelProperty("抵顶配件项")
+    private BigDecimal offsetAccessories;
+
 
 
 	/*
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 cc5b20a368..746fe45cb5 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
@@ -1236,6 +1236,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             orderPrice = busSalesOrderPrice.getSingleFinalPrice();
         }
+        //(合同价+挂车+购置税+保险)
+        BigDecimal bilAll = BigDecimal.ZERO;
+        bilAll = bilAll.add(orderPrice);
         CalculateVo calculateVo = new CalculateVo();
         //计算的初始化
         BigDecimal loanTotal = BigDecimal.ZERO;//融资项目总额
@@ -1249,6 +1252,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         BigDecimal vehTotalPrice = BigDecimal.ZERO;
         BigDecimal interstAll = BigDecimal.ZERO;
         BigDecimal yueAll = BigDecimal.ZERO;
+        //配件抵顶项
+        BigDecimal offsetAccessoriesBig = BigDecimal.ZERO;
         /***************相关计算及字段*****************/
         BigDecimal AmountAll = BigDecimal.ZERO;
 
@@ -1280,13 +1285,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //主车发票价
             loanTotal = loanTotal.add(new BigDecimal(mainVehicleAmount));
             AmountAll = AmountAll.add(new BigDecimal(mainVehicleAmount));
+            offsetAccessoriesBig = offsetAccessoriesBig.add(new BigDecimal(mainVehicleAmount));
         }
         if (accessoriesAmountCb) {//包含配件
             if (StringUtils.isNotBlank(accessoriesAmount)) {
                 loanTotal = loanTotal.add(new BigDecimal(accessoriesAmount));
                 AmountAll = AmountAll.add(new BigDecimal(accessoriesAmount));
+                offsetAccessoriesBig = offsetAccessoriesBig.add(new BigDecimal(accessoriesAmount));
             }
         }
+        offsetAccessoriesBig = offsetAccessoriesBig.subtract(orderPrice);
         if(isOrder){
             //判断成交价与主车发票价和配件之和
             if(AmountAll.compareTo(orderPrice)<0){
@@ -1296,6 +1304,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (trailerAmountCb) {//包含挂车
             if (StringUtils.isNotBlank(trailerAmount)) {
                 loanTotal = loanTotal.add(new BigDecimal(trailerAmount));
+                bilAll = bilAll.add(new BigDecimal(trailerAmount));
             }
         }
         //判断是否打包
@@ -1303,6 +1312,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (premiumCb) {//包含保险
                 if (StringUtils.isNotBlank(premium)) {
                     loanTotal = loanTotal.add(new BigDecimal(premium));
+                    bilAll = bilAll.add(new BigDecimal(premium));
                 }
             } else {
                 if (StringUtils.isNotBlank(premium)) {
@@ -1312,6 +1322,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (purchaseTaxCb) {//包含购置税
                 if (StringUtils.isNotBlank(purchaseTax)) {
                     loanTotal = loanTotal.add(new BigDecimal(purchaseTax));
+                    bilAll = bilAll.add(new BigDecimal(purchaseTax));
                 }
             } else {
                 if (StringUtils.isNotBlank(purchaseTax)) {
@@ -1502,10 +1513,18 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         } else {
             otherPolicyPeriod = "0";
         }
+        if(offsetAccessoriesBig.compareTo(BigDecimal.ZERO)>0){
+            calculateVo.setOffsetAccessories(offsetAccessoriesBig.toString());
+        }else{
+            offsetAccessoriesBig = BigDecimal.ZERO;
+            calculateVo.setOffsetAccessories(offsetAccessoriesBig.toString());
+        }
+
         /************************计算融资首付********************************/
         calculateVo.setLoanDownPay(loanDownPay.setScale(0, BigDecimal.ROUND_HALF_UP).toString());
         //实际首付比例 = （融资首付/融资项目总额）x100
-        downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
+//        downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
+        downPayAmountsRatio = loanDownPay.divide(bilAll, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
         downPayAmountsRatio = downPayAmountsRatio.setScale(2, BigDecimal.ROUND_HALF_UP);
         calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString());
         if (otherPolicyState) {//包含
@@ -1658,6 +1677,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (StringUtils.isNotBlank(offsetPurchasetax)) {
             offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
         }
+        offsetTotal = offsetTotal.add(offsetAccessoriesBig);
         calculateVo.setOffsetTotal(offsetTotal.toString());
         //实收合计 = 应收合计-抵顶合计
         BigDecimal realTotal = receivableTotal.subtract(offsetTotal);
@@ -2364,6 +2384,14 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 offsetPurchasetaxValue = offsetPurchasetaxValue.append("抵顶购置税：").append("-");
             }
             list.add(getValueSpanSize(offsetPurchasetaxValue.toString(), 1, 0, false));
+            //配件抵顶
+            StringBuilder offsetAccessoriesValue = new StringBuilder();
+            if (StringUtils.isNotBlank(solutionssVo.getOffsetAccessories())) {
+                if(new BigDecimal(solutionssVo.getOffsetAccessories()).compareTo(BigDecimal.ZERO)>0){
+                    offsetAccessoriesValue = offsetAccessoriesValue.append("配件抵顶：").append(solutionssVo.getOffsetAccessories());
+                    list.add(getValueSpanSize(offsetAccessoriesValue.toString(), 1, 0, false));
+                }
+            }
             //实收合计
             StringBuilder realTotalValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionssVo.getRealTotal())) {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
index b77a19b41a..2f6e292902 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
@@ -217,5 +217,8 @@ public class AppSolutionVo {
     @ApiModelProperty("保证金类型01固定，02敞口")
     private String bondTypeKey;
 
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
+
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
index 5cd9f1dc96..9eff4d5b08 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
@@ -190,4 +190,7 @@ public class AppSolutionsDetailsVo implements Vo {
 
     @ApiModelProperty("保证金类型01固定，02敞口")
     private String bondTypeKey;
+
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
index 68904f6c4d..f0b3e9139a 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java
@@ -172,4 +172,7 @@ public class AppSolutionssDto implements Dto {
     private String actualDiscount;
     @ApiModelProperty("其他融实际贴息")
     private String otherActualDiscount;
+
+    @ApiModelProperty("抵顶配件项")
+    private String offsetAccessories;
 }