From 5812c5985213bc7039e696ace24d46d9802a6b8d Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 23 Oct 2025 09:56:51 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=87=AA=E5=8A=A9=E6=92=A4=E5=8D=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A0=E8=B4=AD=E5=8D=87=E7=BA=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/SaOrderServiceImpl.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 2c00d6ea..2f5663a4 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
@@ -2298,7 +2298,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             // 撤销注册订单(注册订单,海粉订单,特殊注册订单)
             if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
                     || myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
-                    || (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend())
+                    || (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue().equals(saOrderExt.getOrderTypeExtend()))
             ) {
                 // 逻辑删除会员
                 if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
@@ -2388,6 +2388,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
 
                         cuMember.setConsumeAchieve(gradeDTO.getStartValue());
                     }
+
+                    // 删除加购升级数据
+                    iAcAddUpgradeRecordService.update(Wrappers.<AcAddUpgradeRecord>lambdaUpdate()
+                            .eq(AcAddUpgradeRecord::getPkMember,saOrderExt.getPkMember())
+                            .eq(AcAddUpgradeRecord::getPkOrderId, saOrderExt.getPkId())
+                            .eq(AcAddUpgradeRecord::getDelFlag, EDelFlag.UN_DELETE.getValue())
+                            .set(AcAddUpgradeRecord::getDelFlag, EDelFlag.DELETE.getValue())
+                    );
                 } else if (myOrderVO.getOrderType() == EOrderType.PICK_ORDER.getValue()) {
                     //提货订单退还提货数量
                     if (!iAcPickService.cancelPickOrder(saOrderExt.getOrderCode(), pkApprove)) {