企业微信思域回传

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java

@@ -8,8 +8,11 @@ import com.github.sd4324530.jtuple.Tuple2;
 import com.github.sd4324530.jtuple.Tuple3;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
 import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdRpcDTO;
+import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdV3RpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
+import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionV3RpcDTO;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
+import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiOrderMapper;
 import com.zanxiang.game.back.serve.pojo.TencentAppReport;
@@ -47,7 +50,7 @@ public class GameTencentAppApiOrderServiceImpl extends ServiceImpl<GameTencentAp
 implements IGameTencentAppApiOrderService {
 
     @DubboReference(providedBy = AdvertisingTencentServer.SERVER_DUBBO_NAME)
-    private IUserActionSetRpc userActionSetRpc;
+    private IUserActionSetV3Rpc userActionSetRpc;
     @Autowired
     private IGameTencentAppApiBackLogService gameTencentAppApiBackLogService;
     @Autowired
@@ -220,7 +223,7 @@ implements IGameTencentAppApiOrderService {
         }
         GameTencentAppCallback callback = gameTencentAppCallbackService.getById(user.getCallbackId());
 
-        UserActionRpcDTO.UserIdRpcDTO userId = UserActionRpcDTO.UserIdRpcDTO.builder().build();
+        UserActionV3RpcDTO.UserIdRpcDTO userId = UserActionV3RpcDTO.UserIdRpcDTO.builder().build();
         if ("android".equalsIgnoreCase(callback.getDeviceOsType()))  {
             if(StringUtils.isNotBlank(callback.getMuid())) {
                 userId.setHashImei(callback.getMuid());
@@ -238,14 +241,14 @@ implements IGameTencentAppApiOrderService {
         }
         Map<String, Object> actionParams = new HashMap<>();
         actionParams.put("value", backMoney);
-        DataReportOfAccountIdRpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdRpcDTO.builder()
+        DataReportOfAccountIdV3RpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdV3RpcDTO.builder()
                 .accountId(user.getAdAccountId())
                 .userActionSetId(user.getUserActionSetId())
-                .action(UserActionRpcDTO.builder()
+                .action(UserActionV3RpcDTO.builder()
                         .actionTime(backTime)
                         .actionType(ActionTypeEnum.PURCHASE.getActionType())
                         .userId(userId)
-                        .trace(UserActionRpcDTO.TraceRpcDTO.builder()
+                        .trace(UserActionV3RpcDTO.TraceRpcDTO.builder()
                                 .clickId(callback.getClickId())
                                 .build())
                         .actionParam(actionParams)

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiRoleRegisterServiceImpl.java

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
-import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdRpcDTO;
-import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAppIdRpcDTO;
-import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
+import com.zanxiang.advertising.tencent.base.pojo.dto.*;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
+import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiRoleRegisterMapper;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;
@@ -40,7 +39,7 @@ implements IGameTencentAppApiRoleRegisterService {
     @Autowired
     private IGameTencentAppCallbackService gameTencentAppCallbackService;
     @DubboReference(providedBy = AdvertisingTencentServer.SERVER_DUBBO_NAME)
-    private IUserActionSetRpc userActionSetRpc;
+    private IUserActionSetV3Rpc userActionSetRpc;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -90,7 +89,7 @@ implements IGameTencentAppApiRoleRegisterService {
 
         GameTencentAppCallback callback = gameTencentAppCallbackService.getById(user.getCallbackId());
 
-        UserActionRpcDTO.UserIdRpcDTO userId = UserActionRpcDTO.UserIdRpcDTO.builder().build();
+        UserActionV3RpcDTO.UserIdRpcDTO userId = UserActionV3RpcDTO.UserIdRpcDTO.builder().build();
         if ("android".equalsIgnoreCase(callback.getDeviceOsType()))  {
             if(StringUtils.isNotBlank(callback.getMuid())) {
                 userId.setHashImei(callback.getMuid());
@@ -106,14 +105,14 @@ implements IGameTencentAppApiRoleRegisterService {
                 userId.setHashIdfa(callback.getMuid());
             }
         }
-        DataReportOfAccountIdRpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdRpcDTO.builder()
+        DataReportOfAccountIdV3RpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdV3RpcDTO.builder()
                 .accountId(user.getAdAccountId())
                 .userActionSetId(user.getUserActionSetId())
-                .action(UserActionRpcDTO.builder()
+                .action(UserActionV3RpcDTO.builder()
                         .actionTime(roleRegisterLog.getRegisterTime())
                         .actionType(ActionTypeEnum.CREATE_ROLE.getActionType())
                         .userId(userId)
-                        .trace(UserActionRpcDTO.TraceRpcDTO.builder()
+                        .trace(UserActionV3RpcDTO.TraceRpcDTO.builder()
                                 .clickId(callback.getClickId())
                                 .build())
                         .build())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiUserServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
-import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdRpcDTO;
-import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
-import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
+import com.zanxiang.advertising.tencent.base.pojo.dto.DataReportOfAccountIdV3RpcDTO;
+import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionV3RpcDTO;
+import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentAppApiUserMapper;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiBackLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentAppApiUser;
@@ -17,7 +17,6 @@ import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.service.IGameTencentAppApiBackLogService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppApiUserService;
 import com.zanxiang.game.back.serve.service.IGameTencentAppCallbackService;
-import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +40,7 @@ implements IGameTencentAppApiUserService {
     @Autowired
     private RestTemplate restTemplate;
     @DubboReference(providedBy = AdvertisingTencentServer.SERVER_DUBBO_NAME)
-    private IUserActionSetRpc userActionSetRpc;
+    private IUserActionSetV3Rpc userActionSetRpc;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -84,7 +83,7 @@ implements IGameTencentAppApiUserService {
 
         GameTencentAppCallback callback = gameTencentAppCallbackService.getById(userLog.getCallbackId());
 
-        UserActionRpcDTO.UserIdRpcDTO userId = UserActionRpcDTO.UserIdRpcDTO.builder().build();
+        UserActionV3RpcDTO.UserIdRpcDTO userId = UserActionV3RpcDTO.UserIdRpcDTO.builder().build();
         if ("android".equalsIgnoreCase(callback.getDeviceOsType()))  {
             if(StringUtils.isNotBlank(callback.getMuid())) {
                 userId.setHashImei(callback.getMuid());
@@ -100,14 +99,14 @@ implements IGameTencentAppApiUserService {
                 userId.setHashIdfa(callback.getMuid());
             }
         }
-        DataReportOfAccountIdRpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdRpcDTO.builder()
+        DataReportOfAccountIdV3RpcDTO dataReportOfAccountIdRpcDTO = DataReportOfAccountIdV3RpcDTO.builder()
                 .accountId(userLog.getAdAccountId())
                 .userActionSetId(userLog.getUserActionSetId())
-                .action(UserActionRpcDTO.builder()
+                .action(UserActionV3RpcDTO.builder()
                         .actionTime(userLog.getRegisterTime())
                         .actionType(ActionTypeEnum.ACTIVATE_APP.getActionType())
                         .userId(userId)
-                        .trace(UserActionRpcDTO.TraceRpcDTO.builder()
+                        .trace(UserActionV3RpcDTO.TraceRpcDTO.builder()
                                 .clickId(callback.getClickId())
                                 .build())
                         .build())

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/AgentController.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
+import com.zanxiang.game.module.manage.pojo.dto.TencentNewWebUserActionSetDTO;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
@@ -32,6 +33,12 @@ public class AgentController {
         return ResultVO.ok(agentService.listOfPage(dto));
     }
 
+    @PreAuthorize(permissionKey = "manage:agent:newWebUserActionSet")
+    @PostMapping("/newWebUserActionSet")
+    public ResultVO<Boolean> newWebUserActionSet(@RequestBody @Validated TencentNewWebUserActionSetDTO dto) {
+        return ResultVO.ok(agentService.newWebUserActionSet(dto));
+    }
+
     @PreAuthorize(permissionKey = "manage:agent:add")
     @PostMapping
     public ResultVO<Boolean> add(@Validated @RequestBody AgentAddParam dto) {

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/TencentNewWebUserActionSetDTO.java

@@ -0,0 +1,18 @@
+package com.zanxiang.game.module.manage.pojo.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class TencentNewWebUserActionSetDTO {
+
+    @NotNull(message = "参数错误！！！")
+    private Long adAccountId;
+
+    @NotBlank(message = "数据源名称不能为空")
+    private String name;
+
+    private String description;
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IAgentService.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.manage.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
+import com.zanxiang.game.module.manage.pojo.dto.TencentNewWebUserActionSetDTO;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
@@ -92,4 +93,6 @@ public interface IAgentService extends IService<Agent> {
      * @return {@link AgentDTO}
      */
     AgentDTO getAgentById(long agentId);
+
+    Boolean newWebUserActionSet(TencentNewWebUserActionSetDTO dto);
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AgentServiceImpl.java

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
+import com.zanxiang.advertising.tencent.base.pojo.dto.CreateUserActionSetV3RpcDTO;
 import com.zanxiang.advertising.tencent.base.pojo.vo.UserActionSetRpcVO;
 import com.zanxiang.advertising.tencent.base.rpc.IAdAccountRpc;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
+import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetV3Rpc;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.pojo.vo.SysGameUserGroupRpcVO;
 import com.zanxiang.erp.base.rpc.ISysGameUserGroupRpc;
@@ -21,6 +23,7 @@ import com.zanxiang.game.back.base.rpc.IGameBackPolicyRpc;
 import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.base.pojo.enums.GameAuthEnum;
 import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
+import com.zanxiang.game.module.manage.pojo.dto.TencentNewWebUserActionSetDTO;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
@@ -70,6 +73,9 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
     @DubboReference(providedBy = AdvertisingTencentServer.SERVER_DUBBO_NAME)
     private IUserActionSetRpc userActionSetRpc;
 
+    @DubboReference(providedBy = AdvertisingTencentServer.SERVER_DUBBO_NAME)
+    private IUserActionSetV3Rpc userActionSetV3Rpc;
+
     @DubboReference(providedBy = ErpServer.SERVER_DUBBO_NAME)
     private ISysUserRpc sysUserRpc;
 
@@ -107,6 +113,18 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         return result;
     }
 
+    @Override
+    public Boolean newWebUserActionSet(TencentNewWebUserActionSetDTO dto) {
+        return userActionSetV3Rpc.create(CreateUserActionSetV3RpcDTO.builder()
+                        .accountId(dto.getAdAccountId())
+                        .type("WEB")
+                        .name(dto.getName())
+                        .description(dto.getDescription())
+                        .enableConversionClaim(true)
+                        .unique(true)
+                .build()).getData() != null;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean add(AgentAddParam dto) {