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

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

@@ -173,4 +173,9 @@ public class Game implements Serializable {
      */
     private Boolean rechargeCloseSwitch;
 
+    /**
+     * 关闭注册开关
+     */
+    private Boolean registerCloseSwitch;
+
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -25,7 +25,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <白名单之内导量玩家充值不限制> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <游戏增加禁止注册判断> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -345,14 +345,18 @@ public class LoginServiceImpl implements IRegisterLoginService {
     }
 
     private User userCreateSave(UserData userData, String userName, String password, String mobile, String openId, String sessionKey) {
+        //获取游戏信息
+        Game game = gameService.getById(userData.getGameId());
+        //判断游戏是否禁止注册
+        if (Objects.equals(game.getRegisterCloseSwitch(), Boolean.TRUE)) {
+            throw new BaseException("注册异常，请联系客服!");
+        }
         //锁Key
         String lockKey = RedisKeyConstant.USER_CREATE + userData.getGameId() + "_" + userName;
         //上锁
         if (!distributedLockComponent.doLock(lockKey, 0L, 3L, TimeUnit.MINUTES)) {
             throw new BaseException("用户信息正在注册中, 请勿重复请求!");
         }
-        //获取游戏信息
-        Game game = gameService.getById(userData.getGameId());
         //渠道id, 链接参数, 分享人id
         Tuple3<Long, Map<String, String>, String> tuple3 = agentService.getUserAgentId(game, userData, openId);
         //分享人id

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

@@ -102,10 +102,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     private void rechargeCloseCheck(Game game, User user) {
-        //暗影防线禁止充值
-        if (Objects.equals(game.getId(), 2L)) {
-            throw new BaseException("游戏已经关闭充值, 禁止操作");
-        }
         //白名单过滤
         if (userRechargeWhiteService.count(new LambdaQueryWrapper<UserRechargeWhite>()
                 .eq(UserRechargeWhite::getGameId, game.getId())
@@ -113,11 +109,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         ) > 0) {
             return;
         }
-        //仙剑APP导量玩家禁止充值, 直接APP注册的玩家正常充值
-        if (Objects.equals(game.getSuperGameId(), 12L) && user.getRelationUserId() != null
-                && Objects.equals(game.getCategory(), GameCategoryEnum.CATEGORY_APP.getId())) {
-            throw new BaseException("APP专注畅快游戏体验，充值请回小程序享受完整服务");
-        }
+        throw new BaseException("游戏已经关闭充值, 请联系客服!");
     }
 
     private Order transform(UserData userData, String orderNum, ProductPayParam payParam, User user, GameUser gameUser,