From 1d249222fa5c924fd1c5b41c4fc705bba3bca055 Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Fri, 18 Nov 2022 13:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zsw-bxg/pom.xml                                             | 6 ++++++
 .../modules/user/rest/SystemUserLevelController.java        | 2 +-
 .../modules/user/service/impl/YxUserLevelServiceImpl.java   | 4 +++-
 .../modules/user/service/impl/YxUserServiceImpl.java        | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/zsw-bxg/pom.xml b/zsw-bxg/pom.xml
index 5c14b55e..1a0d6e2d 100644
--- a/zsw-bxg/pom.xml
+++ b/zsw-bxg/pom.xml
@@ -33,6 +33,12 @@
             <version>2.5.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.3.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java
index 9a7c2d2c..d9952320 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java
@@ -83,7 +83,7 @@ public class SystemUserLevelController {
                 .gt(YxSystemUserLevel::getGrade,resources.getGrade())
                 .last("limit 1")
                 .one();
-        if (ObjectUtil.isNotEmpty(yxSystemUserLevel)){
+        if (ObjectUtil.isNotEmpty(yxSystemUserLevel)&&yxSystemUserLevel.equals(resources)){
             throw  new YshopException("已有相同等级会员卡");
         }
         yxSystemUserLevelService.saveOrUpdate(resources);
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
index 460f8062..32d1386e 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
@@ -77,6 +77,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
             levelId =  yxUserLevel.getLevelId();
         }
         int nextLevelId = systemUserLevelService.getNextLevelId(levelId);
+        //当前等级已经是最高级了
         if(nextLevelId == 0) {
             return false;
         }
@@ -113,7 +114,8 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
         wrapper
                 .eq(YxUserLevel::getStatus, ShopCommonEnum.IS_STATUS_1.getValue())
                 .eq(YxUserLevel::getUid,uid)
-                .orderByDesc(YxUserLevel::getGrade);
+//                .orderByDesc(YxUserLevel::getGrade);
+                .orderByDesc(YxUserLevel::getId);
         if(grade != null) {
             wrapper.lt(YxUserLevel::getGrade,grade);
         }
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
index d19f4aff..fb673ccb 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
@@ -396,7 +396,8 @@ public class YxUserServiceImpl extends BaseServiceImpl<BxgUserMapper, YxUser> im
        LambdaQueryWrapper<YxUserLevel> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxUserLevel::getStatus, ShopCommonEnum.IS_STATUS_1.getValue())
                 .eq(YxUserLevel::getUid,uid)
-                .orderByDesc(YxUserLevel::getGrade)
+//                .orderByDesc(YxUserLevel::getGrade)
+                .orderByDesc(YxUserLevel::getId)//因为支持修改用户会员等级，所以不再按等级排序
                 .last("limit 1");
         YxUserLevel userLevel = userLevelService.getOne(wrapper);
         YxSystemUserLevel systemUserLevel = new YxSystemUserLevel();