Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameDto.java

@@ -8,7 +8,7 @@ public class GameDto {
 
     private Integer id;
 
-    private Integer parentId;
+    private Long parentId;
 
     private String gameName;
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -568,6 +568,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
             sendMsgTaskParam.setPageNum(dto.getPageNum());
             sendMsgTaskParam.setPageSize(dto.getPageSize());
             PageUtil<SendMsgVO> sendMsgTaskList = sendMsgRpc.getSendMsgTaskList(sendMsgTaskParam);
+            if(CollectionUtils.isEmpty(sendMsgTaskList.getRecords())){
+                return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
+            }
             //查询所有游戏名称
             Sql sql = Sqls.create(getGameSql());
             sql.setCallback(Sqls.callback.entities());
@@ -575,16 +578,27 @@ public class RoleManageServiceImpl implements IRoleManageService {
             dao.execute(sql);
             List<GameDto> gameDtoList = sql.getList(GameDto.class);
             //将游戏拼成map key为父游戏id，value为游戏名称
-            HashMap<Integer, String> gameMap = new HashMap<>();
+            HashMap<Long, String> gameMap = new HashMap<>();
             gameDtoList.forEach(item -> {
                 gameMap.put(item.getParentId(), item.getGameName());
             });
-            //循环遍历获取游戏名称
+
+            //取创建人id变成list
+            List<Long> userId = sendMsgTaskList.getRecords().stream().
+                    map(SendMsgVO::getCreateBy).collect(Collectors.toList());
+
+            ResultVO<Map<Long, String>> userNameByIds = sysUserRpc.getUserNameByIds(userId);
+            Map<Long, String> userMap = userNameByIds.getData();
+            //循环遍历获取游戏名称, 获取创建人名称
             sendMsgTaskList.getRecords().forEach(item -> {
                 String gameName = gameMap.get(item.getGameId());
                 if (gameName != null){
                     item.setGameName(gameName);
                 }
+                String userName = userMap.get(item.getCreateBy());
+                if (userName != null){
+                    item.setCreateByName(userName);
+                }
             });
             return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
         }catch (Exception exception){
@@ -638,6 +652,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     item.setRoleCreateTime(taskResultDto.getCreateTime());
                     item.setServerName(taskResultDto.getServerName());
                     item.setRoleVip(taskResultDto.getRoleVip());
+                    item.setRoleCreateTime(taskResultDto.getCreateTime());
                 }
             });
 
@@ -683,6 +698,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             parent_id,
                             super_game_id
                         FROM dm_game_order.t_game
+                        where source_system = 'ZX_ONE' and id = parent_id
                 """;
     }
 

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgVO.java

@@ -60,6 +60,10 @@ public class SendMsgVO implements Serializable {
      * 创建人
      */
     private Long createBy;
+    /**
+     * 创建人名称
+     */
+    private String createByName;
 
     /**
      * 创建时间