From 67beb3d14f33c342132fd4cf75b4413c48bdb4fa Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 14 Mar 2025 11:12:44 +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     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 9d51618e51..62ebd4e61c 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
@@ -3476,11 +3476,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             AllAmount = AllAmount.add(new BigDecimal(solutionsDetailsVo.getAccessoriesAmount()));
                         }
                     }
-                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
-                        AllAmount = AllAmount.subtract(new BigDecimal(solutionsDetailsVo.getOffsetAccessories()));
+                    AllAmount = AmountAll.subtract(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice()));
+                    if (AllAmount.compareTo(BigDecimal.ZERO) > 0) {
+                        AllAmount = AllAmount;
+                    } else {
+                        AllAmount = BigDecimal.ZERO;
                     }
-                    if(AllAmount.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) != 0){
-                        return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetAccessories())) {//抵顶配件
+                        if(AllAmount.compareTo(new BigDecimal(solutionsDetailsVo.getOffsetAccessories())) != 0){
+                            return rb.setMsg("需要先完善金融方案信息，再提交订单");
+                        }
                     }
                     //判断成交价与主车发票价和配件之和
                     if (AmountAll.compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) < 0) {