Merge remote-tracking branch 'origin/package' into package-lingfeng

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/AccountTypeEnum.java

@@ -11,7 +11,12 @@ public enum AccountTypeEnum {
     // 头条小游戏
     BYTE(2),
     // 腾讯小游戏
-    TENCENT_MINI_GAME(3);
+    TENCENT_MINI_GAME(3),
+    // 腾讯APP
+    TENCENT_APP(4),
+    // 头条APP
+    BYTE_APP(5)
+    ;
 
     private final Integer value;
 

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

@@ -57,6 +57,12 @@ public class AgentController {
             }
             dto.setReportToken(dto.getReportToken().trim());
             dto.setReportUrl(dto.getReportUrl().trim());
+        } else if (accountType == AccountTypeEnum.TENCENT_APP) {
+            if (dto.getUserActionSetId() == null) {
+                throw new BaseException("腾讯广告账号必须选回传的数据源");
+            }
+        } else if (accountType == AccountTypeEnum.BYTE_APP) {
+            //
         }
         if (dto.getPutStatus() == null) {
             dto.setPutStatus(Agent.PUT_STATUS_ING);