Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <角色列表原始区服> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <角色列表原始区服, 游戏选择列表修改> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameChoiceVO.java

@@ -28,4 +28,10 @@ public class GameChoiceVO {
      */
     @ApiModelProperty(notes = "游戏应用类型id")
     private Long category;
+
+    /**
+     * 超父游戏id
+     */
+    @ApiModelProperty(notes = "超父游戏id")
+    private Long superGameId;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServiceImpl.java

@@ -234,7 +234,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         }
         return super.list(new LambdaQueryWrapper<Game>()
                 .in(!SecurityUtil.isAdmin(), Game::getId, tuple2.getT2())
-                .select(Game::getId, Game::getName, Game::getCategory))
+                .select(Game::getId, Game::getName, Game::getCategory, Game::getSuperGameId))
                 .stream()
                 .map(game -> BeanUtil.copy(game, GameChoiceVO.class))
                 .collect(Collectors.toList());
@@ -251,11 +251,11 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
     @Override
     public Map<Long, GameDTO> gameCondition(List<Long> gameIdList, Long cpId, Long gameId, Long gameCategoryId) {
         List<GameDTO> gameList = super.list(new LambdaQueryWrapper<Game>()
+                .select(Game::getId, Game::getCpId, Game::getName, Game::getCategory, Game::getSuperGameId)
                 .eq(cpId != null, Game::getCpId, cpId)
                 .in(CollectionUtils.isNotEmpty(gameIdList), Game::getId, gameIdList)
                 .eq(gameId != null, Game::getId, gameId)
                 .eq(gameCategoryId != null, Game::getCategory, gameCategoryId)
-                .select(Game::getId, Game::getCpId, Game::getName, Game::getCategory)
         ).stream().map(game -> BeanUtil.copy(game, GameDTO.class)).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(gameList)) {
             return Collections.emptyMap();

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameUserRoleServiceImpl.java

@@ -199,6 +199,13 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
             gameDTO = gameService.getById(gameUserRoleListVO.getGameId());
         }
         if (gameDTO != null) {
+            //设置源服务器名称
+            GameServer gameServer = gameServerService.getOne(new LambdaQueryWrapper<GameServer>()
+                    .eq(GameServer::getGameId, gameDTO.getSuperGameId())
+                    .eq(GameServer::getServerId, gameUserRole.getServerId()));
+            if (gameServer != null) {
+                gameUserRoleListVO.setSourceServerName(gameServer.getServerName());
+            }
             gameUserRoleListVO.setGameName(gameDTO.getName());
             gameUserRoleListVO.setCpId(gameDTO.getCpId());
             gameUserRoleListVO.setCpName(cpMap.get(gameDTO.getCpId()) == null ? null : cpMap.get(gameDTO.getCpId()).getCpName());
@@ -207,13 +214,6 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         }
         //注册充值时间差
         gameUserRoleListVO.setRegPayTimeDiff(DateUtils.getRegPayTimeDiff(gameUserRoleListVO.getRegTime(), gameUserRoleListVO.getLastRechargeTime()));
-        //设置源服务器名称
-        GameServer gameServer = gameServerService.getOne(new LambdaQueryWrapper<GameServer>()
-                .eq(GameServer::getGameId, gameDTO.getSuperGameId())
-                .eq(GameServer::getServerId, gameUserRole.getServerId()));
-        if (gameServer != null) {
-            gameUserRoleListVO.setSourceServerName(gameServer.getServerName());
-        }
         return gameUserRoleListVO;
     }