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

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/CallBackServiceImpl.java

@@ -147,6 +147,7 @@ public class CallBackServiceImpl implements ICallBackService {
                 .channel(agent.getAgentKey())
                 .wechatOpenid(user.getOpenId())
                 .wechatAppId(gameApplet == null ? null : gameApplet.getAppId())
+                .userActionSetId(agent.getUserActionSetId())
                 .build();
     }
 
@@ -185,6 +186,7 @@ public class CallBackServiceImpl implements ICallBackService {
                 .wechatAppId(gameApplet == null ? null : gameApplet.getAppId())
                 .orderStatus(platformOrderDTO.getStatus())
                 .payTime(platformOrderDTO.getPayTime())
+                .userActionSetId(agent.getUserActionSetId())
                 .build();
     }
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameAppletShellServiceImpl.java

@@ -42,12 +42,12 @@ public class GameAppletShellServiceImpl extends ServiceImpl<GameAppletShellMappe
     public Integer getShellSwitch(String appId, String version) {
         GameExt gameExt = gameExtService.getByGameAppId(appId);
         if (gameExt == null) {
-            throw new BaseException("参数错误, 游戏信息不存在");
+            throw new BaseException("游戏参数设置错误, 游戏信息不存在");
         }
         GameAppletShell gameAppletShell = super.getOne(new LambdaQueryWrapper<GameAppletShell>()
                 .eq(GameAppletShell::getGameId, gameExt.getGameId()));
         if (gameAppletShell == null) {
-            throw new BaseException("参数错误, 游戏设置信息不存在");
+            throw new BaseException("游戏参数设置错误, 游戏设置信息不存在");
         }
         //版本为提审版本
         if (Objects.equals(gameAppletShell.getArraignVersion(), version)) {
@@ -59,11 +59,15 @@ public class GameAppletShellServiceImpl extends ServiceImpl<GameAppletShellMappe
             if (Objects.equals(gameAppletShell.getIsAppeal(), Boolean.TRUE)) {
                 return ShellSwitchEnum.SHELL_SWITCH_APPEAL.getShellSwitch();
             }
+            //开启
+            if (Objects.equals(gameAppletShell.getProControlType(), ShellControlEnum.SHELL_CONTROL_OPEN.getShellControl())) {
+                return ShellSwitchEnum.SHELL_SWITCH_OPEN.getShellSwitch();
+            }
             //返回关闭
             return ShellSwitchEnum.SHELL_SWITCH_CLOSE.getShellSwitch();
         }
         log.error("版本信息不存在, appId : {}, version : {}", appId, version);
-        throw new BaseException("参数错误, 版本信息不存在");
+        throw new BaseException("游戏参数设置错误, 版本信息不存在");
     }
 
     @Override