Merge branch 'refs/heads/package' 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回传的问题 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("游戏回传服务启动成功, 修改头条APP回传的问题, bug修改 ( ´･･)ﾉ(._.`)  \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentAppBackRpcImpl.java

@@ -153,8 +153,8 @@ public class TencentAppBackRpcImpl implements ITencentAppBackRpc {
                     .roleName(dto.getRoleName())
                     .roleLevel(dto.getRoleLevel())
                     .build();
+            gameTencentAppRoleRegisterService.save(roleRegister);
         }
-        gameTencentAppRoleRegisterService.save(roleRegister);
         // return ResultVO.ok(gameTencentAppRoleRegisterService.roleRegisterBack(roleRegister));
         return ResultVO.ok(true);
     }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentMiniGameBackRpcImpl.java

@@ -169,8 +169,8 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
                     .roleName(dto.getRoleName())
                     .roleLevel(dto.getRoleLevel())
                     .build();
+            gameTencentMiniGameRoleRegisterService.save(roleRegisterLog);
         }
-        gameTencentMiniGameRoleRegisterService.save(roleRegisterLog);
         return ResultVO.ok(gameTencentMiniGameRoleRegisterService.roleRegisterBack(roleRegisterLog));
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentUserActionBackRpcImpl.java

@@ -140,8 +140,8 @@ public class TencentUserActionBackRpcImpl implements ITencentUserActionBackRpc {
                     .roleName(dto.getRoleName())
                     .roleLevel(dto.getRoleLevel())
                     .build();
+            gameTencentRoleRegisterService.save(roleRegister);
         }
-        gameTencentRoleRegisterService.save(roleRegister);
         return ResultVO.ok(gameTencentRoleRegisterService.roleRegisterBack(roleRegister));
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtAppBackRpcImpl.java

@@ -245,8 +245,8 @@ public class TtAppBackRpcImpl implements ITtAppBackRpc {
                     .backStatus(BackStatusEnum.NO.getBackStatus())
                     .createTime(LocalDateTime.now())
                     .build();
+            gameOceanengineAppRoleRegisterLogService.save(roleRegisterLog);
         }
-        gameOceanengineAppRoleRegisterLogService.save(roleRegisterLog);
         return ResultVO.ok(gameOceanengineAppRoleRegisterLogService.callback(roleRegisterLog));
     }
 

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtMiniGameBackRpcImpl.java

@@ -170,8 +170,8 @@ public class TtMiniGameBackRpcImpl implements ITtMiniGameBackRpc {
                     .backStatus(BackStatusEnum.NO.getBackStatus())
                     .createTime(LocalDateTime.now())
                     .build();
+            gameOceanengineRoleRegisterLogService.save(roleRegisterLog);
         }
-        gameOceanengineRoleRegisterLogService.save(roleRegisterLog);
         return ResultVO.ok(gameOceanengineRoleRegisterLogService.callback(roleRegisterLog));
     }
 }

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

@@ -84,7 +84,7 @@ implements IGameOceanengineAppRoleRegisterLogService {
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() >= gameBackPolicy.getRoleLevelMin()) {
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
                 return BackStatusEnum.NO;
             }
         }

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

@@ -156,7 +156,7 @@ public class GameOceanengineRoleRegisterLogServiceImpl extends ServiceImpl<GameO
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() >= gameBackPolicy.getRoleLevelMin()) {
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
                 return BackStatusEnum.NO;
             }
         }

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

@@ -92,7 +92,7 @@ public class GameTencentAppApiRoleRegisterServiceImpl extends ServiceImpl<GameTe
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() >= gameBackPolicy.getRoleLevelMin()) {
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
                 return Tuple2.with(BackStatusEnum.NO, "等级小于回传策略等级 " + gameBackPolicy.getRoleLevelMin() + "。不回传");
             }
         }

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

@@ -152,7 +152,7 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
         if (roleRegisterLog.getBackPolicyId() != null) {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(roleRegisterLog.getBackPolicyId());
             if (gameBackPolicy.getRoleLevelMin() != null && roleRegisterLog.getRoleLevel() != null
-                    && roleRegisterLog.getRoleLevel() >= gameBackPolicy.getRoleLevelMin()) {
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
                 return Tuple2.with(BackStatusEnum.NO, "等级小于回传策略等级 " + gameBackPolicy.getRoleLevelMin() + "。不回传");
             }
         }

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

@@ -155,7 +155,7 @@ 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()) {
+                    && roleRegisterLog.getRoleLevel() < gameBackPolicy.getRoleLevelMin()) {
                 return BackStatusEnum.NO;
             }
         }