From eccc9cafb9e6019300d6d36a893ad2b57926e2ea Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Tue, 14 Oct 2025 13:16:45 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=8A=A0=E8=B4=AD=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/add/mapper/AcAddUpgradeConfigMapper.java |  3 +++
 .../service/impl/AcAddUpgradeConfigServiceImpl.java   | 11 ++++++++---
 .../mapper/activity/add/AcAddUpgradeConfigMapper.xml  |  3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
index 7367bece..83aab87c 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
@@ -5,6 +5,7 @@ import com.hzs.activity.add.param.AcAddUpgradeListParam;
 import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam;
 import com.hzs.activity.add.vo.AcAddUpgradeConfig;
 import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.common.domain.system.config.BdGrade;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,4 +26,6 @@ public interface AcAddUpgradeConfigMapper extends BaseMapper<AcAddUpgradeConfig>
     List<Integer> selectOrderTypeByBaseId(@Param("pkId") Integer pkId);
 
     List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param);
+
+    BdGrade selectGradeValue(@Param("pkId") Integer pkId);
 }
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
index bced1642..0de2b456 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
@@ -18,6 +18,7 @@ import com.hzs.common.core.enums.EControlType;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.domain.activity.base.AcBaseConfig;
 import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
+import com.hzs.common.domain.system.config.BdGrade;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.system.sys.dto.LoginUser;
 import lombok.extern.slf4j.Slf4j;
@@ -149,11 +150,15 @@ public class AcAddUpgradeConfigServiceImpl extends ServiceImpl<AcAddUpgradeConfi
             List<AcAddUpgradeRuleConfigParam> acAddUpgradeRuleConfigParams = item.getAcAddUpgradeRuleConfigParams();
             if (acAddUpgradeRuleConfigParams != null) {
                 acAddUpgradeRuleConfigParams.forEach(ac -> {
+                    // 获取升级后等级值
+                    BdGrade UpGrade = baseMapper.selectGradeValue(ac.getUpgradeLevel());
+                    // 获取升级前等级值
+                    BdGrade OriginalGrade = baseMapper.selectGradeValue(ac.getOriginalLevel());
                     // 校验升级等级是否小于原等级
-                    if (ac.getUpgradeLevel() < ac.getOriginalLevel()) {
+                    if (UpGrade.getGradeValue() < OriginalGrade.getGradeValue()) {
                         throw new IllegalArgumentException(
-                                String.format("原等级 [%d] 大于升级等级 [%d]，不允许插入！",
-                                        ac.getOriginalLevel(), ac.getUpgradeLevel())
+                                String.format("原等级 [%s] 大于升级等级 [%s]，不允许插入！",
+                                        OriginalGrade.getGradeName(), UpGrade.getGradeName())
                         );
                     }
                     AcAddUpgradeConfig build = AcAddUpgradeConfig.builder()
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
index 7ee56200..e8bbc8bd 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
@@ -88,5 +88,8 @@
             AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
         </if>
     </select>
+    <select id="selectGradeValue" resultType="com.hzs.common.domain.system.config.BdGrade">
+        SELECT * FROM BD_GRADE WHERE PK_ID = #{pkId}
+    </select>
 
 </mapper>