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

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服务启动成功 <解决修仙游戏漏上报角色的问题> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <解决修仙游戏漏上报角色的问题01> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -172,6 +172,10 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
                 0L, 20L, TimeUnit.SECONDS)) {
             return Boolean.TRUE;
         }
+        //玩家信息
+        GameUser gameUser = gameUserService.getOne(new LambdaQueryWrapper<GameUser>()
+                .eq(GameUser::getGameId, userData.getGameId())
+                .eq(GameUser::getUserId, userData.getUserId()));
         //玩家角色信息更新
         if (gameUserRole.getServerId() == null) {
             gameUserRole.setServerId(param.getServerId());
@@ -185,6 +189,9 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         if (param.getExtra() != null) {
             gameUserRole.setExtra(JsonUtil.toString(param.getExtra()));
         }
+        if (gameUser != null) {
+            gameUserRole.setGameUserId(gameUser.getId());
+        }
         gameUserRole.setRoleName(param.getRoleName());
         gameUserRole.setRoleLevel(param.getRoleLevel());
         gameUserRole.setServerName(param.getServerName());
@@ -236,7 +243,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
     private GameUserRole transform(GameUserRoleUpdateParam param, UserData userData, GameUser gameUser, User user) {
         return GameUserRole.builder()
                 .userId(userData.getUserId())
-                .gameUserId(gameUser.getId())
+                .gameUserId(gameUser == null ? 0 : gameUser.getId())
                 .gameId(userData.getGameId())
                 .serverId(param.getServerId())
                 .serverName(param.getServerName())