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

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

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交100･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交1100･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -90,7 +90,7 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
         IPage<GameGiftPackCodeLogVO> result = new Page<>(codeLogIPage.getCurrent(), codeLogIPage.getSize(), codeLogIPage.getTotal());
         if (CollectionUtils.isNotEmpty(codeLogIPage.getRecords())) {
             List<GameGiftPackCodeLog> records = codeLogIPage.getRecords();
-            List<String> serverIds = records.stream().map(GameGiftPackCodeLog::getServerId).collect(Collectors.toList());
+            List<String> serverIds = records.stream().map(GameGiftPackCodeLog::getServerId).distinct().collect(Collectors.toList());
             Map<String, String> gameServerMap = gameServerService.list(new LambdaQueryWrapper<GameServer>()
                     .eq(GameServer::getIsSourceServer, Boolean.TRUE)
                     .in(GameServer::getServerId, serverIds)

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

@@ -63,7 +63,7 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
         IPage<GameGiftPackLinkLogVO> result = new Page<>(linkLogIPage.getCurrent(), linkLogIPage.getSize(), linkLogIPage.getTotal());
         if (CollectionUtils.isNotEmpty(linkLogIPage.getRecords())) {
             List<GameGiftPackLinkLog> records = linkLogIPage.getRecords();
-            List<String> serverIds = records.stream().map(GameGiftPackLinkLog::getServerId).collect(Collectors.toList());
+            List<String> serverIds = records.stream().map(GameGiftPackLinkLog::getServerId).distinct().collect(Collectors.toList());
             Map<String, String> gameServerMap = gameServerService.list(new LambdaQueryWrapper<GameServer>()
                     .in(GameServer::getServerId, serverIds)
                     .eq(GameServer::getIsSourceServer, Boolean.TRUE)