Commit 7c54cc51 authored by Smile's avatar Smile Committed by wux

fix:会员等级显示错误,应该按照会员本身的等级详情显示

parent a8b0f754
...@@ -3,16 +3,19 @@ package cn.iocoder.yudao.module.member.service.score; ...@@ -3,16 +3,19 @@ package cn.iocoder.yudao.module.member.service.score;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService; import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreUpdateReqDTO; import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreUpdateReqDTO;
import cn.iocoder.yudao.module.member.controller.app.userScore.vo.AppMemberUserIdQueryVO;
import cn.iocoder.yudao.module.member.controller.app.userScore.vo.AppMemberUserScoreInfoRespVO; import cn.iocoder.yudao.module.member.controller.app.userScore.vo.AppMemberUserScoreInfoRespVO;
import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberUserLevelConfigDO;
import cn.iocoder.yudao.module.member.dal.dataobject.memberUserLevelDetail.MemberUserLevelDetailsDO;
import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO; import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO;
import cn.iocoder.yudao.module.member.dal.mysql.memberUserScore.MemberUserScoreMapper; import cn.iocoder.yudao.module.member.dal.mysql.memberUserScore.MemberUserScoreMapper;
import cn.iocoder.yudao.module.member.dal.mysql.userLevelDetails.MemberUserLevelDetailsMapper;
import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum; import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum; import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
import cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService; import cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService;
import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO; import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO;
import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreQueryVO; import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreQueryVO;
import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO; import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -40,6 +43,8 @@ public class MemberUserScoreServiceImpl extends AbstractService<MemberUserScoreM ...@@ -40,6 +43,8 @@ public class MemberUserScoreServiceImpl extends AbstractService<MemberUserScoreM
private MemberUserScoreMapper userScoreMapper; private MemberUserScoreMapper userScoreMapper;
@Resource @Resource
private MemberUserLevelConfigService memberUserLevelConfigService; private MemberUserLevelConfigService memberUserLevelConfigService;
@Resource
private MemberUserLevelDetailsMapper memberUserLevelDetailsMapper;
@Override @Override
public void deleteUserScore(Long id) { public void deleteUserScore(Long id) {
...@@ -130,13 +135,17 @@ public class MemberUserScoreServiceImpl extends AbstractService<MemberUserScoreM ...@@ -130,13 +135,17 @@ public class MemberUserScoreServiceImpl extends AbstractService<MemberUserScoreM
.usedScore(userScoreDO.getUsedScore()) .usedScore(userScoreDO.getUsedScore())
.build(); .build();
} }
MemberUserLevelConfigBaseRespVO level = memberUserLevelConfigService.getLevelByCount(userScoreTotal); QueryWrapper queryWrapper = new QueryWrapper();
if (level != null) { queryWrapper.eq("member_id",infoRespVO.getId());
infoRespVO.setLevelName(level.getName()); MemberUserLevelDetailsDO memberUserLevelDetailsDO = memberUserLevelDetailsMapper.selectOne(queryWrapper);
infoRespVO.setLowerCount(level.getLowerCount()); MemberUserLevelConfigDO realLevel = memberUserLevelConfigService.getById(memberUserLevelDetailsDO.getConfigId());
infoRespVO.setUpperCount(level.getUpperCount()); // MemberUserLevelConfigBaseRespVO level = memberUserLevelConfigService.getLevelByCount(userScoreTotal);
infoRespVO.setLevelIcon(level.getIcon()); if (realLevel != null) {
infoRespVO.setLevel(level.getLevel()); infoRespVO.setLevelName(realLevel.getName());
infoRespVO.setLowerCount(realLevel.getLowerCount());
infoRespVO.setUpperCount(realLevel.getUpperCount());
infoRespVO.setLevelIcon(realLevel.getIcon());
infoRespVO.setLevel(realLevel.getLevel());
} }
return infoRespVO; return infoRespVO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment