sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复会员等级问题

Browse Source
This commit is contained in:
sj
2022-11-18 13:35:59 +08:00
parent 0b33a011a2
commit 1d249222fa
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java
+1 -1
View File
@@ -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
+3 -1
View File
@@ -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
+2 -1
View File
@@ -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();