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

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调试解决SQL查询问题> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -178,7 +178,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
             if (super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                     .eq(GameBackLogMediaSdk::getGameId, user.getGameId())
                     .eq(GameBackLogMediaSdk::getUserId, user.getId())
-                    .eq(GameBackLogMediaSdk::getCallBackParam, param.getCallBackTypeEnum().getValue())
+                    .eq(GameBackLogMediaSdk::getCallBackTypeEnum, param.getCallBackTypeEnum().getValue())
             ) > 0) {
                 return false;
             }
@@ -275,7 +275,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                 && super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                 .eq(GameBackLogMediaSdk::getGameId, gameId)
                 .eq(GameBackLogMediaSdk::getUserId, userId)
-                .eq(GameBackLogMediaSdk::getCallBackParam, callBackTypeEnum.getValue())
+                .eq(GameBackLogMediaSdk::getCallBackTypeEnum, callBackTypeEnum.getValue())
         ) > 0) {
             return Tuple2.with(Boolean.FALSE, "当前用户注册已回传, 不重复执行");
         }
@@ -287,7 +287,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                     .eq(GameBackLogMediaSdk::getGameId, gameId)
                     .eq(GameBackLogMediaSdk::getUserId, userId)
                     .eq(GameBackLogMediaSdk::getRoleId, roleId)
-                    .eq(GameBackLogMediaSdk::getCallBackParam, callBackTypeEnum.getValue())
+                    .eq(GameBackLogMediaSdk::getCallBackTypeEnum, callBackTypeEnum.getValue())
             ) > 0) {
                 return Tuple2.with(Boolean.FALSE, "当前角色创角已回传, 不重复执行");
             }
@@ -296,7 +296,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                     && super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                     .eq(GameBackLogMediaSdk::getGameId, gameId)
                     .eq(GameBackLogMediaSdk::getUserId, userId)
-                    .eq(GameBackLogMediaSdk::getCallBackParam, CallBackTypeEnum.CALL_BACK_REGISTER.getValue())
+                    .eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_REGISTER.getValue())
             ) <= 0) {
                 return Tuple2.with(Boolean.FALSE, "当前用户注册未回传, 无法执行创角回传");
             }
@@ -310,7 +310,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                 .eq(GameBackLogMediaSdk::getGameId, gameId)
                 .eq(GameBackLogMediaSdk::getUserId, userId)
                 .eq(GameBackLogMediaSdk::getRoleId, roleId)
-                .eq(GameBackLogMediaSdk::getCallBackParam, CallBackTypeEnum.CALL_BACK_RE_ACTIVE.getValue())
+                .eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_RE_ACTIVE.getValue())
                 .ge(GameBackLogMediaSdk::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
         ) > 0) {
             return Tuple3.with(Boolean.FALSE, null, "今日已执行沉默唤起回传, 不重复执行");
@@ -337,8 +337,8 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
                 .eq(GameBackLogMediaSdk::getGameId, gameId)
                 .eq(GameBackLogMediaSdk::getUserId, userId)
                 .eq(GameBackLogMediaSdk::getRoleId, roleId)
-                .and(qw -> qw.eq(GameBackLogMediaSdk::getCallBackParam, CallBackTypeEnum.CALL_BACK_CREATE_ROLE.getValue())
-                        .or().eq(GameBackLogMediaSdk::getCallBackParam, CallBackTypeEnum.CALL_BACK_ACTIVATE.getValue()))
+                .and(qw -> qw.eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_CREATE_ROLE.getValue())
+                        .or().eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_ACTIVATE.getValue()))
         ) <= 0) {
             return Tuple2.with(Boolean.FALSE, "创角回传未执行, 无法执行新手引导回传");
         }
@@ -346,7 +346,7 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
         if (super.count(new LambdaQueryWrapper<GameBackLogMediaSdk>()
                 .eq(GameBackLogMediaSdk::getGameId, gameId)
                 .eq(GameBackLogMediaSdk::getUserId, userId)
-                .eq(GameBackLogMediaSdk::getCallBackParam, CallBackTypeEnum.CALL_BACK_TUTORIAL_FINISH.getValue())
+                .eq(GameBackLogMediaSdk::getCallBackTypeEnum, CallBackTypeEnum.CALL_BACK_TUTORIAL_FINISH.getValue())
         ) > 0) {
             return Tuple2.with(Boolean.FALSE, "角色已执行新手引导回传, 不重复执行");
         }