cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#I1EVJW 修复bug：青铜会员任务完成后，仍无法解锁

Browse Source
This commit is contained in:
xwb
2020-04-29 10:59:30 +08:00
parent c9ce5fffe0
commit 2e49b9b971
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java
View File

@ -33,7 +33,7 @@ public interface YxUserLevelService extends BaseService<YxUserLevel> {
UserLevelInfoDTO getUserLevelInfo(int id);
int getUserLevel(int uid,int grade);
YxUserLevel getUserLevel(int uid,int grade);
/**
* 根据ID获取查询对象

2
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java
View File

@ -133,7 +133,7 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl<YxSystemUserLe
*/
@Override
public UserLevelDTO getLevelInfo(int uid,boolean isTask) {
int id = userLevelService.getUserLevel(uid,0); //用户当前等级id
int id = userLevelService.getUserLevel(uid,0).getId(); //用户当前等级id
UserLevelInfoDTO userLevelInfoDTO = null;
if(id > 0) userLevelInfoDTO = userLevelService.getUserLevelInfo(id);
int levelId = 0;

12
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
View File

@ -119,7 +119,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
YxUserQueryVo userQueryVo = userService.getYxUserById(uid);
if(ObjectUtil.isNull(userQueryVo)) return false;
int levelId = getUserLevel(uid,9);
int levelId = getUserLevel(uid,9).getLevelId();
int nextLevelId = systemUserLevelService.getNextLevelId(levelId);
if(nextLevelId == 0) return false;
@ -152,14 +152,14 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
* @return
*/
@Override
public int getUserLevel(int uid, int grade) {
public YxUserLevel getUserLevel(int uid, int grade) {
QueryWrapper<YxUserLevel> 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<YxUserLevelMapper, Y
return getUserLevel(uid,userLevel.getGrade());
}
return userLevel.getId();
return userLevel;
}
@Override