diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java index 7784c79..ba37736 100644 --- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java +++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java @@ -60,58 +60,23 @@ public class SysProfileController extends BaseController String username = SecurityUtils.getUsername(); SysUser user = userService.selectUserByUserName(username); + if(StringUtils.isNull(user)){ + return AjaxResult.error("服务器繁忙,资源请求失败!"); + } + //隐藏不需要返回前端的信息 SysUserDto userDto = new SysUserDto(); - SysRoleDto roleDto = new SysRoleDto(); - BeanUtils.copyProperties(user,userDto); - if (StringUtils.isNull(user.getRoles()) || user.getRoles().size() < 1) - { - //todo 动态获取注册用户信息 - roleDto.setRoleId(2L); - roleDto.setRoleKey("registered"); - roleDto.setRoleName("L2"); - roleDto.setLevel("L2"); - }else { - SysRole sysRole = user.getRoles().get(0); - BeanUtils.copyProperties(sysRole,roleDto); - if (sysRole.getRoleId() == 1L) { - roleDto.setLevel("admin"); - } else if (sysRole.getRoleId() == 2L) { - roleDto.setLevel("L2"); - } else if (sysRole.getRoleId() == 3L) { - roleDto.setLevel("L3"); + SysRole sysRole = user.getRoles().get(0); - //此时角色是L3 说明应该在会员有效期 - SysUserLeveDate userLevelInfo = userLevelMapper.getUserLevelInfo(SecurityUtils.getUserId()); - if(StringUtils.isNotNull(userLevelInfo)){ - if(userLevelInfo.getLevelType() == 0){ - roleDto.setRoleName("月度"+roleDto.getRoleName()); - }else if(userLevelInfo.getLevelType() == 1){ - roleDto.setRoleName("年度"+roleDto.getRoleName()); - } - }else { - //如果查询不到userLevelInfo 说明用户已过期 修改profit返回的用户等级为L2 - roleDto.setRoleId(2L); - roleDto.setRoleKey("registered"); - roleDto.setRoleName("L2"); - roleDto.setLevel("L2"); - } - } else if (sysRole.getRoleId() == 4L) { - roleDto.setLevel("L4"); - }else { - roleDto.setLevel(roleDto.getRoleKey()); - } - - } + SysRoleDto roleDto = new SysRoleDto(); + BeanUtils.copyProperties(sysRole,roleDto); userDto.setRole(roleDto); - //AjaxResult ajax = AjaxResult.success(userDto); - - //ajax.put("roleGroup", userService.selectUserRoleGroup(username)); return AjaxResult.success(userDto); + } @PostMapping("userLevel")