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服务启动成功 <原始区服名称1> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -60,8 +60,12 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         if (Strings.isBlank(serverName)) {
             return Collections.emptyList();
         }
+        GameDTO gameDTO = null;
+        if (gameId != null) {
+            gameDTO = gameService.getById(gameId);
+        }
         return super.list(new LambdaQueryWrapper<GameServer>()
-                .eq(gameId != null, GameServer::getGameId, gameId)
+                .eq(gameDTO != null, GameServer::getGameId, gameDTO == null ? null : gameDTO.getSuperGameId())
                 .like(Strings.isNotBlank(serverName), GameServer::getServerName, serverName)
         ).stream().map(GameServer::getServerId).collect(Collectors.toList());
     }

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

@@ -184,8 +184,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
         OrderVO orderVO = BeanUtil.copy(order, OrderVO.class);
         //原始区服名称
+        GameDTO gameDTO = gameService.getById(order.getGameId());
         GameServer gameServer = gameServerService.getOne(new LambdaQueryWrapper<GameServer>()
-                .eq(GameServer::getGameId, order.getGameId())
+                .eq(GameServer::getGameId, gameDTO.getSuperGameId())
                 .eq(GameServer::getServerId, order.getServerId()));
         if (gameServer != null) {
             orderVO.setSourceServerName(gameServer.getServerName());