From 534bd7b5f53f5774e18f5342d792423d454796e4 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 14 Mar 2025 11:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=97=B6=E9=AA=8C=E8=AF=81=E9=87=91=E8=9E=8D=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E4=B8=AD=E7=9A=84=E5=8F=91=E7=A5=A8=E4=BB=B7+?=
 =?UTF-8?q?=E9=85=8D=E4=BB=B6-=E9=85=8D=E4=BB=B6=E6=8A=B5=E9=A1=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=89=E4=BA=8E=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E5=8D=95=E8=BD=A6=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 17d0d6662f..9d51618e51 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
@@ -3464,15 +3464,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         return rb.setMsg("金融方案中实收金额小于单台订金");
                     }
                     BigDecimal AmountAll = BigDecimal.ZERO;
+                    BigDecimal AllAmount = BigDecimal.ZERO;
                     if (StringUtils.isNotBlank(solutionsDetailsVo.getMainVehicleAmount())) {
                         //主车发票价
                         AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()));
+                        AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()));
                     }
                     if (solutionsDetailsVo.isAccessoriesAmountCb()) {//包含配件
                         if (StringUtils.isNotBlank(solutionsDetailsVo.getAccessoriesAmount())) {
                             AmountAll = AmountAll.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
+                            AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
                         }
                     }
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
+                        AllAmount = AllAmount.subtract(new BigDecimal(solutionsDetailsVo.getOffsetAccessories()));
+                    }
+                    if(AllAmount.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) != 0){
+                        return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                    }
                     //判断成交价与主车发票价和配件之和
                     if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {
                         return rb.setMsg("主车发票价与配件之和不能小于订单成交价");
@@ -8563,7 +8572,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String customerSid = busSalesOrder.getCustomerSid();
         LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
         if (loanPreloanCreditApply != null) {
-            if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey()))|| !"通过".equals(loanPreloanCreditApply.getSsjg())) {
+            if ((!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) || !"通过".equals(loanPreloanCreditApply.getSsjg())) {
                 return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
             }
         }