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服务启动成功 <补充客服支付判定条件 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < ( 下班时间, 已接入玩家取消自动回复´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -81,7 +81,7 @@ public class GameAuthServiceImpl extends ServiceImpl<GameAuthMapper, GameAuth> i
                         .eq(GameAuth::getGameId, gameAuthBean.getGameId())
                         .eq(GameAuth::getUserId, userId)
                 ) > 0) {
-                    throw new BaseException("参数错误, 提交的用户存在重复权限");
+                    return;
                 }
                 addList.add(this.transform(gameAuthBean, userId));
             });

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

@@ -179,6 +179,11 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
     }
 
     private void systemReplyHandle(Long gameId, String openId, KfRoom kfRoom) {
+        //判断玩家是否已接入状态, 非带接入状态, 不发送
+        KfSessionUser kfSessionUser = kfSessionUserService.getById(openId);
+        if (Objects.equals(kfSessionUser.getIsWait(), Boolean.FALSE)) {
+            return;
+        }
         //获取自动回复配置
         KfSystemReply kfSystemReply = kfSystemReplyService.getById(gameId);
         if (kfSystemReply == null) {