diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java index 8af9fa0d..48a569af 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java @@ -33,7 +33,7 @@ public interface YxUserLevelService extends BaseService { UserLevelInfoDTO getUserLevelInfo(int id); - int getUserLevel(int uid,int grade); + YxUserLevel getUserLevel(int uid,int grade); /** * 根据ID获取查询对象 diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java index b216850b..ae9d9fae 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java @@ -133,7 +133,7 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl 0) userLevelInfoDTO = userLevelService.getUserLevelInfo(id); int levelId = 0; diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java index 874a2c5b..7b902b97 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java @@ -119,7 +119,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("is_del",0).eq("status",1) .eq("uid",uid).orderByDesc("grade"); if(grade > 0) wrapper.lt("grade",grade); - YxUserLevel userLevel = yxUserLevelMapper.selectOne(wrapper); - if(ObjectUtil.isNull(userLevel)) return 0; - if(userLevel.getIsForever() == 1) return userLevel.getId(); + YxUserLevel userLevel = this.getOne(wrapper,false); + if(ObjectUtil.isNull(userLevel)) return new YxUserLevel(); + if(userLevel.getIsForever() == 1) return userLevel; int nowTime = OrderUtil.getSecondTimestampTwo(); if(nowTime > userLevel.getValidTime()){ if(userLevel.getStatus() == 1){ @@ -169,7 +169,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl