Merge remote-tracking branch 'origin/master'

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -38,6 +38,8 @@
             ya.app_id,
             ya.app_key,
             ya.app_name,
+            ya.superior_id,
+            pua.app_name superiorName,
             ya.user_id,
             ya.app_type,
             ya.apk_url,
@@ -63,6 +65,7 @@
             u.nick_name
         FROM
             yt_app ya
+                JOIN yt_platform_user_app pua on ya.superior_id = pua.app_id
                 LEFT JOIN yt_app_channel_relative acr ON ya.app_id = acr.app_id
                 LEFT JOIN yt_platform_user u ON ya.user_id = u.user_id
         WHERE
@@ -78,7 +81,7 @@
     </select>
     <select id="getIssuedAppList" resultType="com.ytpm.agent.model.YtPlatformUserApp">
         select
-            app_id, app_name, user_id, app_type, app_key, store_on_sale, store_type, store_url, package_name, domain, category, sub_category, coppa, screen_orientation, ccpa, issued_time
+           app_id, app_name, user_id, app_type, detail_url, package_name, domain, issued_time, wx_app_id
         from yt_platform_user_app
         where user_id = #{userId}
     </select>

yt-common/src/main/java/com/ytpm/advertise/enums/AdSourceTypeEnum.java

@@ -0,0 +1,20 @@
+package com.ytpm.advertise.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum AdSourceTypeEnum {
+    Native(0, "原生（信息流）"),
+    rewarded_video(1, "激励视频"),
+    banner(2, "横幅"),
+    interstitial(3, "插屏"),
+    splash(4, "开屏"),
+    ;
+    private int adSourceType;
+    private String adSourceName;
+
+    AdSourceTypeEnum(int adSourceType, String adSourceName) {
+        this.adSourceType = adSourceType;
+        this.adSourceName = adSourceName;
+    }
+}

yt-common/src/main/java/com/ytpm/agent/model/YtPlatformUserApp.java

@@ -17,28 +17,12 @@ public class YtPlatformUserApp {
     private String userId;
     @ApiModelProperty("应用类型")
     private Integer appType;
-    @ApiModelProperty("应用秘钥")
-    private String appKey;
-    @ApiModelProperty("是否商店上架")
-    private Integer storeOnSale;
-    @ApiModelProperty("商店类型")
-    private Integer storeType;
-    @ApiModelProperty("应用商店链接")
-    private String storeUrl;
-    @ApiModelProperty("报名")
+    @ApiModelProperty("详情页链接")
+    private String detailUrl;
+    @ApiModelProperty("完整程序包名")
     private String packageName;
     @ApiModelProperty("域名")
     private String domain;
-    @ApiModelProperty("一级分类")
-    private String category;
-    @ApiModelProperty("二级分类")
-    private String subCategory;
-    @ApiModelProperty("是否遵守coppa")
-    private Integer coppa;
-    @ApiModelProperty("是否遵守ccpa")
-    private Integer ccpa;
-    @ApiModelProperty("屏幕方向 1-竖屏 2-横屏 3-所有")
-    private Integer screenOrientation;
     @ApiModelProperty("上架时间")
     private Date issuedTime;
 }

yt-common/src/main/java/com/ytpm/agent/param/AppParam.java

@@ -52,4 +52,6 @@ public class AppParam {
     private Long ditchId;
     @ApiModelProperty("渠道类型名称")
     private String ditchName;
+    @ApiModelProperty("上级应用ID（母包）")
+    private String superiorId;
 }

yt-common/src/main/java/com/ytpm/agent/view/AgentAppView.java

@@ -112,4 +112,9 @@ public class AgentAppView {
     @ApiModelProperty("三方广告平台的ECPM")
     private String ecpm_api;
 
+
+    @ApiModelProperty("上级应用ID（母包）")
+    private String superiorId;
+    @ApiModelProperty("上级应用名称")
+    private String superiorName;
 }

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ytpm.advertise.enums.AdSourceTypeEnum;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.agent.model.YtAppUser;
 import com.ytpm.agent.model.YtPlatformBanned;
@@ -467,11 +468,14 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
         if(records.isEmpty()){
             return Result.resultOk(RepMessage.QUERY_SUCCESS);
         }
-        //校验风控742规则
-        RiskTemplateView ecpmLimit= configMapper.getByCode("742");
+        //过滤出当日的激励视频数据
         records = records.stream().filter(s->
             DateUtil.isSameDay(DateUtil.parse(s.getFinishTime()), new Date())
+                &&
+                    AdSourceTypeEnum.rewarded_video.getAdSourceType() == s.getAdSourceType()
         ).collect(Collectors.toList());
+        //校验风控742规则
+        RiskTemplateView ecpmLimit= configMapper.getByCode("742");
         checkRisk742(ecpmLimit,userId,records);
         //校验风控746规则
         checkRisk746(userId,records,userRevenue);