Sfoglia il codice sorgente

feat : 用户详情接口修改

bilingfeng 2 anni fa
parent
commit
ed2a09752e

+ 3 - 1
game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameUserRoleServiceImpl.java

@@ -101,7 +101,9 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
             GameUserVO gameUserVO = gameUserService.getById(role.getGameUserId());
             if (gameUserVO != null) {
                 PromoChannel promoChannel = promoChannelService.getById(gameUserVO.getAgentId());
-                gameUserRoleVO.setChannelName(promoChannel.getChannel());
+                if (promoChannel != null) {
+                    gameUserRoleVO.setChannelName(promoChannel.getChannel());
+                }
             }
             list.add(gameUserRoleVO);
         });

+ 1 - 1
game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/UserLoginLogServiceImpl.java

@@ -59,10 +59,10 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
      * @return : 玩家角色登录信息展示对象
      */
     private UserRoleLoginVO toVo(UserLoginLog userLoginLog) {
+        UserRoleLoginVO roleLoginVO = BeanUtils.copy(userLoginLog, UserRoleLoginVO.class);
         if (userLoginLog == null) {
             return null;
         }
-        UserRoleLoginVO roleLoginVO = BeanUtils.copy(userLoginLog, UserRoleLoginVO.class);
         roleLoginVO.setLoginIp(userLoginLog.getIp());
         roleLoginVO.setLoginTime(userLoginLog.getCreateTime());
         //查询角色名称

+ 1 - 0
game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/UserServiceImpl.java

@@ -156,6 +156,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (Objects.isNull(userListVO)) {
             return null;
         }
+        userListVO.setMobile(user.getShowPhoneNum());
         UserDTO userDTO = StringUtils.isEmpty(userMap) ? null : userMap.get(userListVO.getId());
         if (userDTO == null) {
             userDTO = this.getById(userListVO.getId());