|
@@ -7,13 +7,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
|
|
|
+import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
|
|
|
import com.zanxiang.game.module.manage.pojo.dto.UserDTO;
|
|
|
import com.zanxiang.game.module.manage.pojo.params.UserNameAuthListParam;
|
|
|
import com.zanxiang.game.module.manage.pojo.vo.UserCardVO;
|
|
|
-import com.zanxiang.game.module.manage.service.IAgentService;
|
|
|
-import com.zanxiang.game.module.manage.service.IGameUserRoleService;
|
|
|
-import com.zanxiang.game.module.manage.service.IUserCardService;
|
|
|
-import com.zanxiang.game.module.manage.service.IUserService;
|
|
|
+import com.zanxiang.game.module.manage.service.*;
|
|
|
import com.zanxiang.game.module.mybatis.entity.GameUserRole;
|
|
|
import com.zanxiang.game.module.mybatis.entity.UserCard;
|
|
|
import com.zanxiang.game.module.mybatis.mapper.UserCardMapper;
|
|
@@ -49,6 +47,9 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
|
|
|
@Autowired
|
|
|
private IGameUserRoleService gameUserRoleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IGameService gameService;
|
|
|
+
|
|
|
@Override
|
|
|
public IPage<UserCardVO> getUserCardList(UserNameAuthListParam param) {
|
|
|
//渠道获取
|
|
@@ -84,6 +85,12 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
|
|
|
UserDTO userDTO = userService.getById(userCard.getUserId());
|
|
|
GameUserRole gameUserRole = gameUserRoleService.getLastGameUserRoleName(userDTO.getId(), userDTO.getGameId());
|
|
|
userCardVO.setLastGameRoleName(gameUserRole == null ? null : gameUserRole.getRoleName());
|
|
|
+ //游戏名称
|
|
|
+ userCardVO.setGameId(gameUserRole == null ? null : gameUserRole.getGameId());
|
|
|
+ if (userCardVO.getGameId() != null) {
|
|
|
+ GameDTO gameDTO = gameService.getById(userCardVO.getGameId());
|
|
|
+ userCardVO.setGameName(gameDTO == null ? null : gameDTO.getName());
|
|
|
+ }
|
|
|
return userCardVO;
|
|
|
}
|
|
|
|