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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -18,7 +18,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("游戏回传服务启动成功, 修改头条APP回传的问题, bug修改 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("游戏回传服务启动成功, 修改头条APP回传的问题, bug修改123 ( ´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineRoleRegisterLogServiceImpl.java

@@ -136,10 +136,7 @@ public class GameOceanengineRoleRegisterLogServiceImpl extends ServiceImpl<GameO
                     .build());
             return BackStatusEnum.FAILED;
         }
-        // 回传用户激活
-        if (Objects.equals(BackStatusEnum.NO.getBackStatus(), userLog.getBackStatus())) {
-            gameOceanengineUserLogService.callback(userLog, true);
-        }
+
         //判断创角是否已回传
         if (gameOceanengineBackLogService.count(new LambdaQueryWrapper<GameOceanengineBackLog>()
                 .eq(GameOceanengineBackLog::getGameId, userLog.getGameId())
@@ -153,6 +150,7 @@ public class GameOceanengineRoleRegisterLogServiceImpl extends ServiceImpl<GameO
             return BackStatusEnum.NO;
         }
 
+        //回传策略等级判断
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
@@ -160,6 +158,12 @@ public class GameOceanengineRoleRegisterLogServiceImpl extends ServiceImpl<GameO
                 return BackStatusEnum.NO;
             }
         }
+
+        // 回传用户激活
+        if (Objects.equals(BackStatusEnum.NO.getBackStatus(), userLog.getBackStatus())) {
+            gameOceanengineUserLogService.callback(userLog, true);
+        }
+
         //创角回传
         MiniGameCallback.MiniGameCallbackRequest request = MiniGameCallback.MiniGameCallbackRequest.builder()
                 .clue_token(userLog.getClueToken())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiRoleRegisterServiceImpl.java

@@ -68,6 +68,14 @@ public class GameTencentAppApiRoleRegisterServiceImpl extends ServiceImpl<GameTe
     }
 
     private Tuple2<BackStatusEnum, String> doCallback(GameTencentAppApiRoleRegister roleRegisterLog) {
+        if (roleRegisterLog.getBackPolicyId() != null) {
+            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
+            if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
+                return Tuple2.with(BackStatusEnum.NO, "等级小于回传策略等级 " + gameBackPolicy.getRoleLevelMin() + "。不回传");
+            }
+        }
+
         GameTencentAppApiUser user = gameTencentAppApiUserService.getOne(new LambdaQueryWrapper<GameTencentAppApiUser>()
                 .eq(GameTencentAppApiUser::getGameId, roleRegisterLog.getGameId())
                 .eq(GameTencentAppApiUser::getUserId, roleRegisterLog.getUserId())
@@ -75,6 +83,7 @@ public class GameTencentAppApiRoleRegisterServiceImpl extends ServiceImpl<GameTe
                 .orderByDesc(GameTencentAppApiUser::getCreateTime)
                 .last("limit 1")
         );
+
         if (user != null) {
             if (user.getCallbackId() == null || user.getCallbackId() < 1) {
                 return Tuple2.with(BackStatusEnum.FAILED, "用户匹配不到广告");
@@ -89,14 +98,6 @@ public class GameTencentAppApiRoleRegisterServiceImpl extends ServiceImpl<GameTe
             return Tuple2.with(BackStatusEnum.FAILED, "找不到用户");
         }
 
-        if (roleRegisterLog.getBackPolicyId() != null) {
-            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
-            if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
-                return Tuple2.with(BackStatusEnum.NO, "等级小于回传策略等级 " + gameBackPolicy.getRoleLevelMin() + "。不回传");
-            }
-        }
-
         GameTencentAppCallback callback = gameTencentAppCallbackService.getById(user.getCallbackId());
 
         UserActionV3RpcDTO.UserIdRpcDTO userId = UserActionV3RpcDTO.UserIdRpcDTO.builder().build();

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameRoleRegisterServiceImpl.java

@@ -131,11 +131,7 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
                 .orderByDesc(GameTencentMiniGameUser::getCreateTime)
                 .last("limit 1")
         );
-        //判断注册是否回传
-        if (user != null && Objects.equals(BackStatusEnum.NO.getBackStatus(), user.getBackStatus())) {
-            //注册回传
-            gameTencentMiniGameUserService.userBack(user);
-        }
+
         //判断创角是否回传
         if (gameTencentMiniGameBackLogService.count(new LambdaQueryWrapper<GameTencentMiniGameBackLog>()
                 .eq(GameTencentMiniGameBackLog::getGameId, roleRegisterLog.getGameId())
@@ -149,6 +145,7 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
             return Tuple2.with(BackStatusEnum.NO, "创角已回传，默认不重复传");
         }
 
+        //回传策略等级控制
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
@@ -157,6 +154,12 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
             }
         }
 
+        //判断注册是否回传
+        if (user != null && Objects.equals(BackStatusEnum.NO.getBackStatus(), user.getBackStatus())) {
+            //注册回传
+            gameTencentMiniGameUserService.userBack(user);
+        }
+
         //创角回传
         return gameTencentMiniGameBackLogService.roleRegisterBack(roleRegisterLog);
     }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentRoleRegisterServiceImpl.java

@@ -135,6 +135,14 @@ public class GameTencentRoleRegisterServiceImpl extends ServiceImpl<GameTencentR
 
 
     private BackStatusEnum doCallback(GameTencentRoleRegister roleRegisterLog) {
+        if (roleRegisterLog.getBackPolicyId() != null) {
+            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
+            if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
+                return BackStatusEnum.NO;
+            }
+        }
+
         GameTencentUser user = gameTencentUserService.getOne(new LambdaQueryWrapper<GameTencentUser>()
                 .eq(GameTencentUser::getGameId, roleRegisterLog.getGameId())
                 .eq(GameTencentUser::getWechatAppId, roleRegisterLog.getWechatAppId())
@@ -152,14 +160,6 @@ public class GameTencentRoleRegisterServiceImpl extends ServiceImpl<GameTencentR
             }
         }
 
-        if (roleRegisterLog.getBackPolicyId() != null) {
-            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
-            if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
-                return BackStatusEnum.NO;
-            }
-        }
-
         Map<String, Object> actionParam = new HashMap<>(2);
         actionParam.put("claim_type", 0);
         DataReportOfAppIdRpcDTO dataReportOfAppIdRpcDTO = DataReportOfAppIdRpcDTO.builder()