From 69c5a8a0bfd886e736bd73782a0b8d07779b7be0 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 1 Jul 2025 16:09:23 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=A9=BA=E5=8D=95=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=AE=A2=E5=8D=95=E6=8A=A5=E9=94=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/SaOrderServiceImpl.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index 30573063..7cad8626 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -2648,10 +2648,18 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                     throw new ServiceException("当前已经是可以购买的最高等级");
                 }
                 // 盒数基数 = 手动升级盒数 + 手动升级之后的升级订单盒数
-                baseBoxNum = lastUpdateGrade.getBoxNumber().add(saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType));
+                BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType);
+                if (null != oldBoxNum) {
+                    baseBoxNum = lastUpdateGrade.getBoxNumber().add(oldBoxNum);
+                } else {
+                    baseBoxNum = lastUpdateGrade.getBoxNumber();
+                }
             } else {
                 // 没有手动升级记录
-                baseBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType);
+                BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType);
+                if (null != oldBoxNum) {
+                    baseBoxNum = oldBoxNum;
+                }
             }
         }
         return baseBoxNum;