Переглянути джерело

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

zhimo 3 місяців тому
батько
коміт
b45de3da59

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

@@ -168,4 +168,9 @@ public class Game implements Serializable {
      */
     private Boolean apiBackSwitch;
 
+    /**
+     * 关闭充值开关
+     */
+    private Boolean rechargeCloseSwitch;
+
 }

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

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <腾讯SDK媒体回传业务逻辑修改提交> ( ´・・)ノ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <腾讯SDK媒体回传业务逻辑修改提交01> ( ´・・)ノ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -63,6 +63,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Long gameId = userData.getGameId();
         //游戏信息
         Game game = gameService.getById(gameId);
+        if (Objects.equals(game.getRechargeCloseSwitch(), Boolean.TRUE)) {
+            throw new BaseException("游戏已经关闭充值, 禁止操作");
+        }
         //玩家信息
         GameUser gameUser = gameUserService.getOne(new LambdaQueryWrapper<GameUser>()
                 .eq(GameUser::getUserId, userData.getUserId()));
@@ -71,7 +74,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .eq(GameUserRole::getGameId, gameId)
                 .eq(GameUserRole::getUserId, userData.getUserId())
                 .eq(GameUserRole::getRoleId, payParam.getRoleId()));
-        if (game == null || gameUser == null || gameUserRole == null) {
+        if (gameUser == null || gameUserRole == null) {
             log.error("游戏用户信息不全, game : {}, gameUser : {}, gameUserRole : {}", JsonUtil.toString(game),
                     JsonUtil.toString(gameUser), JsonUtil.toString(gameUserRole));
             throw new BaseException("参数错误, 游戏用户信息不全");