修复会员等级问题

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>

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);

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);
         }

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();