Parcourir la source

feat : APP直投兼容修改1

bilingfeng il y a 11 mois
Parent
commit
88a61dae52

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

+ 4 - 2
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/CallBackController.java

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * @author : lingfeng
  * @time : 2024-06-26
@@ -34,8 +36,8 @@ public class CallBackController {
 
     @ApiOperation(value = "获取游戏广告媒体回传sdk配置")
     @GetMapping("/ad/sdk/config")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
-    public ResultVO<String> getAdSdkConfig(UserData userData) {
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Map.class)})
+    public ResultVO<Map<String, Object>> getAdSdkConfig(UserData userData) {
         return ResultVO.ok(gameService.getAdSdkConfig(userData));
     }
 

+ 0 - 5
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/enums/CallBackTypeEnum.java

@@ -27,11 +27,6 @@ public enum CallBackTypeEnum {
      */
     CALL_BACK_LOGIN_IN("CALL_BACK_LOGIN_IN"),
 
-    /**
-     * 下单
-     */
-    CALL_BACK_CREATE_ORDER("CALL_BACK_CREATE_ORDER"),
-
     /**
      * 支付
      */

+ 5 - 0
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/pojo/param/CallBackControlParam.java

@@ -23,4 +23,9 @@ public class CallBackControlParam {
      * 订单id, 当行为类型为下单, 支付时, 则订单id必传
      */
     private String orderId;
+
+    /**
+     * 角色id, 当行为类型为激活(创建角色)时, 需要传
+     */
+    private String roleId;
 }

+ 3 - 1
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IGameService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.mybatis.entity.Game;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;
 
+import java.util.Map;
+
 /**
  * @author : xufeng
  * @time : 2022-07-13
@@ -17,5 +19,5 @@ public interface IGameService extends IService<Game> {
      * @param userData : 玩家信息
      * @return : 返回配置
      */
-    String getAdSdkConfig(UserData userData);
+    Map<String, Object> getAdSdkConfig(UserData userData);
 }

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

@@ -66,11 +66,8 @@ public class CallBackServiceImpl implements ICallBackService {
     @Override
     public boolean callBackJudge(CallBackControlParam param, UserData userData) {
         CallBackTypeEnum callBackTypeEnum = param.getCallBackTypeEnum();
-        if (Objects.equals(callBackTypeEnum, CallBackTypeEnum.CALL_BACK_CREATE_ORDER)
-                || Objects.equals(callBackTypeEnum, CallBackTypeEnum.CALL_BACK_PAY_ORDER)) {
-            if (Strings.isBlank(param.getOrderId())) {
-                throw new BaseException("参数错误, 下单或者支付行为缺少订单id");
-            }
+        if (Objects.equals(callBackTypeEnum, CallBackTypeEnum.CALL_BACK_PAY_ORDER) && Strings.isBlank(param.getOrderId())) {
+            throw new BaseException("参数错误, 下单或者支付行为缺少订单id");
         }
         //todo : 接入策略判断方法
         return userData.getUserId() % 2 == 0;

+ 4 - 3
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameServiceImpl.java

@@ -11,6 +11,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.Map;
 
 /**
  * @author : lingfeng
@@ -22,11 +23,11 @@ import java.util.Collections;
 public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IGameService {
 
     @Override
-    public String getAdSdkConfig(UserData userData) {
+    public Map<String, Object> getAdSdkConfig(UserData userData) {
         Game game = super.getById(userData.getGameId());
         if (Strings.isBlank(game.getAdSdkConfig())) {
-            return JsonUtil.toString(Collections.singletonMap("adSdk", 0));
+            return Collections.singletonMap("adSdk", 0);
         }
-        return game.getAdSdkConfig();
+        return JsonUtil.toMap(game.getAdSdkConfig(), Map.class, Object.class);
     }
 }