Browse Source

dubbo升级 3.2.3

wcc 1 year ago
parent
commit
1f648932de

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

@@ -40,7 +40,7 @@ public class AgentController {
         if (accountType == null) {
             throw new BaseException("错误的账号类型:" + dto.getAccountType());
         }
-        if (accountType == AccountTypeEnum.TENCENT) {
+        if (accountType == AccountTypeEnum.TENCENT_H5) {
             if (dto.getUserActionSetId() == null) {
                 throw new BaseException("腾讯广告账号必须选回传的数据源");
             }

+ 3 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/enums/AccountTypeEnum.java

@@ -4,8 +4,9 @@ import lombok.Getter;
 
 @Getter
 public enum AccountTypeEnum {
-    TENCENT(1),
-    BYTE(2);
+    TENCENT_H5(1),
+    BYTE(2),
+    TENCENT_MINI_GAME(3);
 
     private final Integer value;
 

+ 1 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/AgentAddParam.java

@@ -24,7 +24,7 @@ public class AgentAddParam {
     /**
      * 推广账号类型(1:腾讯、2:头条)
      */
-    @ApiModelProperty(notes = "推广账号类型(1:腾讯、2:头条)")
+    @ApiModelProperty(notes = "推广账号类型(1:腾讯H5、2:头条、3:腾讯小游戏)")
     @NotNull(message = "渠道类型不能为空")
     private Integer accountType;
 

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

@@ -143,7 +143,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         Set<Long> backPolicyIds = new HashSet<>();
         agentList.forEach(agent -> {
             gameIds.add(agent.getGameId());
-            if (AccountTypeEnum.TENCENT.getValue().equals(agent.getAccountType())) {
+            if (AccountTypeEnum.TENCENT_H5.getValue().equals(agent.getAccountType())
+                    || AccountTypeEnum.TENCENT_MINI_GAME.getValue().equals(agent.getAccountType())) {
                 txAccountIds.add(agent.getAccountId());
             }
             userIds.add(agent.getCreateBy());
@@ -170,7 +171,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         return agentList.stream().map(agent -> {
             AgentVO vo = BeanUtil.copy(agent, AgentVO.class);
             vo.setGameInfo(gameMap.get(agent.getGameId()));
-            if (AccountTypeEnum.TENCENT.getValue().equals(agent.getAccountType())) {
+            if (AccountTypeEnum.TENCENT_H5.getValue().equals(agent.getAccountType())) {
                 vo.setUserActionSet(userActionSetMap.get(agent.getAccountId() + "_" + agent.getUserActionSetId()));
             }
             vo.setCreateByName(userMap.get(agent.getCreateBy()));

+ 1 - 1
pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.zanxiang</groupId>
         <artifactId>microservices-parent</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath/>
     </parent>