|
@@ -11,8 +11,10 @@ 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.params.UserNameAuthListParam;
|
|
import com.zanxiang.game.module.manage.pojo.vo.UserCardVO;
|
|
import com.zanxiang.game.module.manage.pojo.vo.UserCardVO;
|
|
import com.zanxiang.game.module.manage.service.IAgentService;
|
|
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.IUserCardService;
|
|
import com.zanxiang.game.module.manage.service.IUserService;
|
|
import com.zanxiang.game.module.manage.service.IUserService;
|
|
|
|
+import com.zanxiang.game.module.mybatis.entity.GameUserRole;
|
|
import com.zanxiang.game.module.mybatis.entity.UserCard;
|
|
import com.zanxiang.game.module.mybatis.entity.UserCard;
|
|
import com.zanxiang.game.module.mybatis.mapper.UserCardMapper;
|
|
import com.zanxiang.game.module.mybatis.mapper.UserCardMapper;
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
@@ -44,6 +46,9 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
|
|
@Autowired
|
|
@Autowired
|
|
private IAgentService agentService;
|
|
private IAgentService agentService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IGameUserRoleService gameUserRoleService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public IPage<UserCardVO> getUserCardList(UserNameAuthListParam param) {
|
|
public IPage<UserCardVO> getUserCardList(UserNameAuthListParam param) {
|
|
//渠道获取
|
|
//渠道获取
|
|
@@ -75,6 +80,10 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
|
|
UserCardVO userCardVO = BeanUtil.copy(userCard, UserCardVO.class);
|
|
UserCardVO userCardVO = BeanUtil.copy(userCard, UserCardVO.class);
|
|
userCardVO.setCardId(userCard.getShowCardId());
|
|
userCardVO.setCardId(userCard.getShowCardId());
|
|
userCardVO.setCardName(userCard.getShowCardName());
|
|
userCardVO.setCardName(userCard.getShowCardName());
|
|
|
|
+ //最近角色
|
|
|
|
+ UserDTO userDTO = userService.getById(userCard.getUserId());
|
|
|
|
+ GameUserRole gameUserRole = gameUserRoleService.getLastGameUserRoleName(userDTO.getId(), userDTO.getGameId());
|
|
|
|
+ userCardVO.setLastGameRoleName(gameUserRole == null ? null : gameUserRole.getRoleName());
|
|
return userCardVO;
|
|
return userCardVO;
|
|
}
|
|
}
|
|
|
|
|