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

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服务启动成功 <Websocket客服支付订单只发送一次> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <Websocket客服系统游戏权限区分新老系统> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -116,6 +116,7 @@ public class KfMsgServiceImpl implements IKfMsgService {
         }
         return gameAppletService.list(new LambdaQueryWrapper<GameApplet>()
                 .eq(GameApplet::getType, 1)
+                .eq(GameApplet::getKfNew, Boolean.FALSE)
                 .in(!SecurityUtil.isAdmin(), GameApplet::getGameId,
                         gameAuthList.stream().map(GameAuth::getGameId).collect(Collectors.toSet()))
         ).stream().map(this::toVO).collect(Collectors.toList());

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

@@ -118,6 +118,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
                 .in(!SecurityUtil.isAdmin(), GameApplet::getGameId,
                         gameAuthList.stream().map(GameAuth::getGameId).collect(Collectors.toSet()))
                 .eq(GameApplet::getType, 1)
+                .eq(GameApplet::getKfNew, Boolean.TRUE)
         ).stream().map(gameApplet -> this.transform(gameApplet, kfUserId)).collect(Collectors.toList());
     }
 

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

@@ -120,6 +120,11 @@ public class GameApplet implements Serializable {
      */
     private String remark;
 
+    /**
+     * 是否新客服系统
+     */
+    private Boolean kfNew;
+
     /**
      * 1 删除  0 正常
      */