Quellcode durchsuchen

feat : APP直投兼容修改3

bilingfeng vor 9 Monaten
Ursprung
Commit
307d2d2ad8

+ 11 - 0
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/CpPushErrorLog.java

@@ -0,0 +1,11 @@
+package com.zanxiang.game.module.mybatis.entity;
+
+/**
+ * @author : lingfeng
+ * @time : 2024-06-27
+ * @description : CP推送数据错误日志
+ */
+public class CpPushErrorLog {
+
+
+}

+ 1 - 1
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服务启动成功 <APP直投兼容修改2> ( ´・・)ノ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <APP直投兼容修改3> ( ´・・)ノ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

+ 6 - 0
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/pojo/vo/UserLoginVO.java

@@ -88,4 +88,10 @@ public class UserLoginVO {
      */
     @ApiModelProperty(notes = "小游戏壳包控制开关")
     private Integer appletShellSwitch;
+
+    /**
+     * 是否注册用户
+     */
+    @ApiModelProperty(notes = "是否注册用户")
+    private Boolean regUser;
 }

+ 2 - 0
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/CallBackServiceImpl.java

@@ -74,6 +74,8 @@ public class CallBackServiceImpl implements ICallBackService {
         }
         //todo : 接入策略判断方法
         boolean b = userData.getUserId() % 2 == 0;
+
+        log.error("事件回传判断返回, b : {}", b);
         return b;
     }
 

+ 1 - 0
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/CpPushDataServiceImpl.java

@@ -171,6 +171,7 @@ public class CpPushDataServiceImpl implements ICpPushDataService {
                 .serverId(gameUserRole.getServerId())
                 .serverName(gameUserRole.getServerName())
                 .amount(param.getAmount())
+                .realAmount(param.getStatus() == 2 ? param.getAmount() : null)
                 .productId(param.getProductId())
                 .productName(param.getProductName())
                 .deviceSystem(user.getDeviceSystem())

+ 2 - 0
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameServiceImpl.java

@@ -32,6 +32,8 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
             return Collections.singletonMap("adSdk", 0);
         }
         Map<String, Object> map = JsonUtil.toMap(game.getAdSdkConfig(), Map.class, Object.class);
+
+        log.error("媒体初始化配置返回, map : {}", JsonUtil.toString(map));
         return map;
     }
 }

+ 8 - 2
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -203,6 +203,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
             if (tuple2.getT1()) {
                 userLoginVO.setUserId(tuple2.getT2());
             }
+            userLoginVO.setRegUser(Boolean.FALSE);
             //返回登录信息
             return ResultVO.ok(userLoginVO);
         }
@@ -214,7 +215,9 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //用户注册
         user = userCreateSave(userData, username, RegisterUtil.cmfPassword(password), null, null, null);
         //返回登录信息
-        return ResultVO.ok(this.createUserLoginVO(user, userData));
+        UserLoginVO userLoginVO = this.createUserLoginVO(user, userData);
+        userLoginVO.setRegUser(Boolean.TRUE);
+        return ResultVO.ok(userLoginVO);
     }
 
     @Override
@@ -250,13 +253,16 @@ public class LoginServiceImpl implements IRegisterLoginService {
                 userLoginVO.setUserId(tuple2.getT2());
                 log.error("导量用户返回用户信息, userLoginVO : {}", JsonUtil.toString(userLoginVO));
             }
+            userLoginVO.setRegUser(Boolean.FALSE);
             //返回登录信息
             return ResultVO.ok(userLoginVO);
         }
         //用户注册
         user = userCreateSave(userData, mobile, null, mobile, null, null);
         //返回登录信息
-        return ResultVO.ok(this.createUserLoginVO(user, userData));
+        UserLoginVO userLoginVO = this.createUserLoginVO(user, userData);
+        userLoginVO.setRegUser(Boolean.TRUE);
+        return ResultVO.ok(userLoginVO);
     }
 
     private Tuple2<Boolean, Long> userGuideCheck(User user) {