Merge branch '7-短剧app关键行为优化' into 'release_20240408_01'

dy短剧关键行为优化

See merge request !39

src/main/java/com/lwby/marketing/att/dyvideo/handle/DyvideoBehaviorFlow.java

@@ -117,6 +117,11 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
 
                 Date date = new Date();
                 Map<String, Integer> resultCountMap = null;
+                Number behavoirType = BehavoirType.PECPMMODELCOUNT.getBehavoirType(appChannel);
+                Integer pecpmModel = null;
+                if (behavoirType != null) {
+                    pecpmModel = behavoirType.intValue();
+                }
                 if (now.toLocalTime().isBefore(six)) {
                     //当天6点之前，查两天,先查昨天的ecpm指标
                     Calendar calendar = Calendar.getInstance(); // 获取日历对象
@@ -124,7 +129,7 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
                     calendar.add(Calendar.DAY_OF_MONTH, -1); // 将时间减去一天
                     Date day = calendar.getTime();
                     resultCountMap = up.getResultCountList(day, openId, accessToken, tvcCount, motivateCount, pecpmCount,
-                            BehavoirType.PECPMMODELCOUNT.getBehavoirType(appChannel).intValue(), userId, tokenDy, dyMarketPlatformAppIdList,env);
+                            pecpmModel, userId, tokenDy, dyMarketPlatformAppIdList,env);
                     if (resultCountMap != null && resultCountMap.size() != 0) {
                         tvcCount = resultCountMap.get("tvc");
                         if (tvcCount != null) {
@@ -136,7 +141,7 @@ public class DyvideoBehaviorFlow extends NodeSwitchFlow<StoryNovelAction> {
                 }
                 //查询今天的ecpm指标
                 resultCountMap = up.getResultCountList(date, openId, accessToken, tvcCount, motivateCount, pecpmCount,
-                        BehavoirType.PECPMMODELCOUNT.getBehavoirType(appChannel).intValue(), userId, tokenDy, dyMarketPlatformAppIdList,env);
+                        pecpmModel, userId, tokenDy, dyMarketPlatformAppIdList,env);
                 if (resultCountMap != null && resultCountMap.size() != 0) {
                     tvcCount = resultCountMap.get("tvc");
                     if (tvcCount != null) {