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/params/GameServerListParam.java

@@ -45,4 +45,9 @@ public class GameServerListParam extends BaseListDTO<GameServer> {
      * 开服时间区间-结束
      */
     private LocalDate endTime;
+
+    /**
+     * 是否原始服
+     */
+    private Boolean isSourceServer;
 }

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

@@ -130,6 +130,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
                 .like(Strings.isNotBlank(param.getNickName()), GameServer::getNickName, param.getNickName())
                 .ge(param.getStartTime() != null, GameServer::getStartTime, param.getStartTime() == null ? null : LocalDateTime.of(param.getStartTime(), LocalTime.MIN))
                 .le(param.getEndTime() != null, GameServer::getStartTime, param.getEndTime() == null ? null : LocalDateTime.of(param.getEndTime(), LocalTime.MAX))
+                .eq(param.getIsSourceServer() != null, GameServer::getIsSourceServer, param.getIsSourceServer())
                 .orderByDesc(GameServer::getStartTime)
         ).convert(this::toVo);
     }
@@ -235,6 +236,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         return super.update(new LambdaUpdateWrapper<GameServer>()
                 .set(GameServer::getIsMerge, Boolean.TRUE)
                 .set(GameServer::getUpdateTime, LocalDateTime.now())
+                .eq(GameServer::getGameId, param.getGameId())
                 .in(GameServer::getServerId, param.getServerIdList()));
     }
 
@@ -264,6 +266,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
                 .select(GameServer::getServerId, GameServer::getServerName)
                 .eq(GameServer::getGameId, gameId)
                 .eq(GameServer::getIsMerge, Boolean.FALSE)
+                .orderByAsc(GameServer::getStartTime)
         ).stream().map(gameServer -> BeanUtil.copy(gameServer, GameServerVO.class))
                 .collect(Collectors.toList());
     }

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

@@ -28,7 +28,6 @@ import com.zanxiang.game.module.mybatis.entity.GameUser;
 import com.zanxiang.game.module.mybatis.entity.GameUserRole;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.mapper.UserMapper;
-import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.exception.BaseException;
@@ -98,10 +97,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             gameDTO = gameService.getById(gameService.getById(user.getGameId()).getH5GameId());
         } else if (type == 2) {
             //查询安卓游戏
-            GameDTO gameDTO1 = gameService.getById(user.getGameId());
-
-            log.error("查询到的有 ----------> gameDTO1 : {}", JsonUtil.toString(gameDTO1));
-
             gameDTO = gameService.getById(gameService.getById(user.getGameId()).getAndroidGameId());
         } else if (type == 3) {
             //查询ios游戏

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Game.java

@@ -111,4 +111,14 @@ public class Game implements Serializable {
      * 超父游戏id
      */
     private Long superGameId;
+
+    /**
+     * 安卓游戏id
+     */
+    private Long androidGameId;
+
+    /**
+     * ios游戏id
+     */
+    private Long iosGameId;
 }