腾讯新增创角回传

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TencentOrderRpcDTO.java → game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TencentOrderDTO.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TencentOrderRpcDTO implements Serializable {
+public class TencentOrderDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 回传策略ID

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TencentUserRpcDTO.java → game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/dto/TencentUserDTO.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TencentUserRpcDTO implements Serializable {
+public class TencentUserDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 回传策略ID

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITencentMiniGameBackRpc.java

@@ -1,8 +1,8 @@
 package com.zanxiang.game.back.base.rpc;
 
-import com.zanxiang.game.back.base.pojo.dto.TencentOrderRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TencentUserRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
 /**
@@ -13,12 +13,12 @@ public interface ITencentMiniGameBackRpc {
     /**
      * 订单回传
      */
-    ResultVO<Boolean> backOrder(TencentOrderRpcDTO dto);
+    ResultVO<Boolean> backOrder(TencentOrderDTO dto);
 
     /**
      * 用户回传
      */
-    ResultVO<Boolean> backUser(TencentUserRpcDTO dto);
+    ResultVO<Boolean> backUser(TencentUserDTO dto);
 
     /**
      * 用户回传

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITencentUserActionBackRpc.java

@@ -1,8 +1,8 @@
 package com.zanxiang.game.back.base.rpc;
 
-import com.zanxiang.game.back.base.pojo.dto.TencentOrderRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TencentUserRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
 /**
@@ -12,12 +12,12 @@ public interface ITencentUserActionBackRpc {
     /**
      * 订单回传
      */
-    ResultVO<Boolean> backOrder(TencentOrderRpcDTO dto);
+    ResultVO<Boolean> backOrder(TencentOrderDTO dto);
 
     /**
      * 用户回传
      */
-    ResultVO<Boolean> backUser(TencentUserRpcDTO dto);
+    ResultVO<Boolean> backUser(TencentUserDTO dto);
 
     ResultVO<Boolean> backRoleRegister(TencentRoleRegisterRpcDTO dto);
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentMiniGameBackRpcImpl.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.back.serve.rpc.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zanxiang.game.back.base.pojo.dto.TencentOrderRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TencentUserRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.rpc.ITencentMiniGameBackRpc;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameOrder;
@@ -34,7 +34,7 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
     private IGameTencentMiniGameRoleRegisterService gameTencentMiniGameRoleRegisterService;
 
     @Override
-    public ResultVO<Boolean> backOrder(TencentOrderRpcDTO dto) {
+    public ResultVO<Boolean> backOrder(TencentOrderDTO dto) {
         if (Objects.equals(OrderStatusEnum.SUCCESS_PAY.getValue(), dto.getOrderStatus())) {
             log.error("腾讯小游戏订单回传收到：{}。", JsonUtil.toString(dto));
         } else {
@@ -90,7 +90,7 @@ public class TencentMiniGameBackRpcImpl implements ITencentMiniGameBackRpc {
     }
 
     @Override
-    public ResultVO<Boolean> backUser(TencentUserRpcDTO dto) {
+    public ResultVO<Boolean> backUser(TencentUserDTO dto) {
         log.error("腾讯小游戏用户回传收到：{}", JsonUtil.toString(dto));
         GameTencentMiniGameUser userLog = GameTencentMiniGameUser.builder()
                 .adAccountId(dto.getAdAccountId())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TencentUserActionBackRpcImpl.java

@@ -2,9 +2,9 @@ package com.zanxiang.game.back.serve.rpc.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zanxiang.game.back.base.pojo.dto.TencentOrderRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentOrderDTO;
 import com.zanxiang.game.back.base.pojo.dto.TencentRoleRegisterRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TencentUserRpcDTO;
+import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.rpc.ITencentUserActionBackRpc;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentOrder;
@@ -35,7 +35,7 @@ public class TencentUserActionBackRpcImpl implements ITencentUserActionBackRpc {
     private IGameTencentRoleRegisterService gameTencentRoleRegisterService;
 
     @Override
-    public ResultVO<Boolean> backOrder(TencentOrderRpcDTO dto) {
+    public ResultVO<Boolean> backOrder(TencentOrderDTO dto) {
         if (Objects.equals(OrderStatusEnum.SUCCESS_PAY.getValue(), dto.getOrderStatus())) {
             log.error("腾讯H5订单回传收到：{}。", JsonUtil.toString(dto));
         } else {
@@ -78,7 +78,7 @@ public class TencentUserActionBackRpcImpl implements ITencentUserActionBackRpc {
     }
 
     @Override
-    public ResultVO<Boolean> backUser(TencentUserRpcDTO dto) {
+    public ResultVO<Boolean> backUser(TencentUserDTO dto) {
         log.error("腾讯H5用户回传收到：{}", JsonUtil.toString(dto));
         GameTencentUser gameTencentUser = GameTencentUser.builder()
                 .adAccountId(dto.getAdAccountId())

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

@@ -82,13 +82,13 @@ public class CallBackServiceImpl implements ICallBackService {
         try {
             //腾讯H5回传
             if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_H5.getValue())) {
-                TencentUserRpcDTO tencentUserDTO = this.transform(user, agent, gameApplet);
+                TencentUserDTO tencentUserDTO = this.transform(user, agent, gameApplet);
                 tencentUserActionBackRpc.backUser(tencentUserDTO);
                 gameBackLogService.addLog(user.getId(), null, "腾讯H5用户回传提交", JsonUtil.toString(tencentUserDTO));
             }
             //腾讯小游戏回传
             if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_MINI_GAME.getValue())) {
-                TencentUserRpcDTO tencentUserDTO = this.transform(user, agent, gameApplet);
+                TencentUserDTO tencentUserDTO = this.transform(user, agent, gameApplet);
                 //解析设置clickId
                 Map<String, String> channelMap = agentService.channelTransform(user.getChannel());
                 tencentUserDTO.setClickId(channelMap.get("gdt_vid"));
@@ -132,13 +132,13 @@ public class CallBackServiceImpl implements ICallBackService {
         try {
             //腾讯H5回传
             if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_H5.getValue())) {
-                TencentOrderRpcDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
+                TencentOrderDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
                 tencentUserActionBackRpc.backOrder(tencentOrderDTO);
                 gameBackLogService.addLog(user.getId(), platformOrderDTO.getOrderId(), "腾讯H5订单回传提交", JsonUtil.toString(tencentOrderDTO));
             }
             //腾讯小游戏回传
             if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_MINI_GAME.getValue())) {
-                TencentOrderRpcDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
+                TencentOrderDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
                 //解析设置clickId
                 Map<String, String> channelMap = agentService.channelTransform(user.getChannel());
                 tencentOrderDTO.setClickId(channelMap.get("gdt_vid"));
@@ -160,8 +160,8 @@ public class CallBackServiceImpl implements ICallBackService {
         }
     }
 
-    private TencentUserRpcDTO transform(User user, Agent agent, GameApplet gameApplet) {
-        return TencentUserRpcDTO.builder()
+    private TencentUserDTO transform(User user, Agent agent, GameApplet gameApplet) {
+        return TencentUserDTO.builder()
                 .backPolicyId(agent.getBackPolicyId())
                 .gameId(user.getGameId())
                 .adAccountId(agent.getAccountId())
@@ -194,8 +194,8 @@ public class CallBackServiceImpl implements ICallBackService {
                 .build();
     }
 
-    private TencentOrderRpcDTO transform(PlatformOrderDTO platformOrderDTO, User user, Agent agent, GameApplet gameApplet) {
-        return TencentOrderRpcDTO.builder()
+    private TencentOrderDTO transform(PlatformOrderDTO platformOrderDTO, User user, Agent agent, GameApplet gameApplet) {
+        return TencentOrderDTO.builder()
                 .backPolicyId(agent.getBackPolicyId())
                 .gameId(platformOrderDTO.getGameId())
                 .adAccountId(agent.getAccountId())