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

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

@@ -25,7 +25,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <小游戏绑定手机号自动转端> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <角色信息上报接口更新, 腾讯媒体sdk回传更新> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -509,14 +509,12 @@ public class GameBackLogMediaSdkServiceImpl extends ServiceImpl<GameBackLogMedia
             }
             doBack = orderBackQueryRpcVO.getDoBack();
             backMsg = orderBackQueryRpcVO.getBackMsg();
-            //米大师支付会被监听, 漏单修正, 直接更改结果为回传
+            //SDK接入后支付会被监听(包含米大师支付和客服支付), 漏单修正, 直接更改结果为回传
             if (Objects.equals(orderBackQueryRpcVO.getDoBack(), Boolean.FALSE)) {
                 PlatformOrderDTO platformOrderDTO = orderService.getByOrderId(orderId);
-                if (Objects.equals(platformOrderDTO.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId())) {
-                    doBack = Boolean.TRUE;
-                    amount = Collections.singletonList(platformOrderDTO.getAmount().longValue() * 100);
-                    backMsg = "米大师漏单, 直接修正为原订单金额回传";
-                }
+                doBack = Boolean.TRUE;
+                amount = Collections.singletonList(platformOrderDTO.getAmount().longValue() * 100);
+                backMsg = "回传漏单, 直接修正为原订单金额回传";
             }
         }
         //微信小游戏投巨量广告 (坑逼腾讯要其他渠道的订单数据)

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

@@ -148,29 +148,21 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         if (gameUserRole == null) {
             //新建游戏角色
             this.gameRoleCreate(param, userData);
-            //刚创建的角色, 如果是更新请求, 则不需要执行
-            if (Objects.equals(dataType, DataTypeEnum.TYPE_LEVEL_UP.getDateType())) {
-                return Boolean.TRUE;
-            }
+        } else {
+            //角色信息更新
+            this.gameRoleUpdate(param, gameUserRole, userData);
         }
-        //进入游戏
+        //进入游戏, 插入用户登录记录
         if (Objects.equals(dataType, DataTypeEnum.TYPE_ENTER_GAME.getDateType())) {
-            //插入用户登录记录
-            return userLoginLogService.createRoleLoginLog(userData, param.getRoleId(), param.getRoleName(),
+            userLoginLogService.createRoleLoginLog(userData, param.getRoleId(), param.getRoleName(),
                     LoginTypeEnum.LOGIN_IN.getLoginType());
         }
-        //等级提升更新
-        if (gameUserRole != null && Objects.equals(dataType, DataTypeEnum.TYPE_LEVEL_UP.getDateType())) {
-            //角色更新
-            return this.gameRoleUpdate(param, gameUserRole, userData);
-        }
-        //退出游戏
+        //退出游戏, 插入用户退出记录
         if (Objects.equals(dataType, DataTypeEnum.TYPE_EXIT_GAME.getDateType())) {
-            //插入用户退出记录
-            return userLoginLogService.createRoleLoginLog(userData, param.getRoleId(), param.getRoleName(),
+            userLoginLogService.createRoleLoginLog(userData, param.getRoleId(), param.getRoleName(),
                     LoginTypeEnum.LOGIN_OUT.getLoginType());
         }
-        return Boolean.FALSE;
+        return Boolean.TRUE;
     }
 
     private boolean gameRoleUpdate(GameUserRoleUpdateParam param, GameUserRole gameUserRole, UserData userData) {