feat: agent 今日收益/今日视频播放数 调整为 当日收益/当日视频播放数

yt-common/src/main/java/com/ytpm/app/view/YtAppUserListView.java

@@ -58,7 +58,7 @@ public class YtAppUserListView extends PageMeta {
     @CustomField(value = "user_status",desc = "用户状态", node = 1)
     @ApiModelProperty("用户状态")
     private Integer userStatus;
-    @ApiModelProperty("今日视频播放数")
+    @ApiModelProperty("当日视频播放数")
     private Integer todayVideo;
     @ApiModelProperty("视频总播放数")
     private Integer totalVideo;

yt-common/src/main/java/com/ytpm/general/ResultTable.java

@@ -59,7 +59,7 @@ public class ResultTable<T> implements Serializable {
      * @param pageInfo 分页插件返回实体
      * @return
      */
-    public static <T> ResultTable resultTableOk(PageInfo<T> pageInfo) {
+    public static <T> ResultTable<T> resultTableOk(PageInfo<T> pageInfo) {
         //当前页
         int currentPage = pageInfo.getPageNum();
         //每页的数量

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/UserController.java

@@ -73,66 +73,74 @@ public class UserController {
         //查询主应用
         PageHelper.startPage(param.getPage(), param.getLimit());
         List<YtAppUserListView> result = appUserMapper.queryAll(param);
-        String collect = result.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(","));
-        List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(collect);
-        List<YtDyzLoginRecord> dyzLogins = loginRecordMapper.getLoginRecordByIds(collect);
-        Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream().collect(
-                Collectors.groupingBy(YtDyzAdRecord::getUserId));
-        Map<String, List<YtDyzLoginRecord>> loginMap = dyzLogins.stream().collect(
-                Collectors.groupingBy(YtDyzLoginRecord::getUserId));
-        setUserExtInfo(result,param, userAdMap,loginMap);
+        setUserExtInfo(result,param);
         return ResultTable.resultTableOk(new PageInfo<>(result));
     }
 
     /**
-     * 设置视频记录和登录信息
+     * 记录用户额外信息<br>
+     * 1.查询用户过往登陆信息<br>
+     * 2.查询并计算用户当日收益、当日视频播放数、前三日收益<br>
      */
-    private void setUserExtInfo(List<YtAppUserListView> result,YtAppUserListParam param,
-                                Map<String, List<YtDyzAdRecord>> userAdMap, Map<String, List<YtDyzLoginRecord>> loginMap) {
-        List<YtDyzAdRecord> ytDyzAdRecords;
-        DateTime currentDate = DateUtil.date();
+    private void setUserExtInfo(List<YtAppUserListView> result,YtAppUserListParam param) {
+        String userIds = result.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(","));
+        List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(userIds);
+        List<YtDyzLoginRecord> dyzLogins = loginRecordMapper.getLoginRecordByIds(userIds);
+        Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream()
+                .collect(Collectors.groupingBy(YtDyzAdRecord::getUserId));
+        Map<String, List<YtDyzLoginRecord>> loginMap = dyzLogins.stream()
+                .collect(Collectors.groupingBy(YtDyzLoginRecord::getUserId));
         for (YtAppUserListView user : result) {
             if (loginMap.containsKey(user.getUserId())) {
                 user.setLoginRecordList(loginMap.get(user.getUserId()));
             }
-            //获取当日收益收益 | 当日收益视频播放数 = 统计筛选登陆时间段
-            int todayVideo = 0;
-            BigDecimal todayIncome = BigDecimal.ZERO;
-            if (userAdMap.containsKey(user.getUserId())) {
-                // 默认筛选今日广告记录 并计算前三日收益
-                ytDyzAdRecords = userAdMap.get(user.getUserId()).stream()
-                        .filter(s -> DateUtil.isSameDay(currentDate, DateUtil.parseDate(s.getFinishTime())))
-                        .collect(Collectors.toList());
-                todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
-                        .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-                // 统计4天-今日收益=前三日收益
-                if (user.getNearlyIncome() != null && user.getNearlyIncome().compareTo(todayIncome) >= 0) {
-                    user.setNearlyIncome(user.getNearlyIncome().subtract(todayIncome));
+            computeTodayIncome(user, userAdMap.get(user.getUserId()), param);
+        }
+    }
+
+    /**
+     * 当日收益、当日视频播放数、前三日收益
+     */
+    private void computeTodayIncome(YtAppUserListView user, List<YtDyzAdRecord> adRecords, YtAppUserListParam param) {
+        //获取当日收益收益 | 当日收益视频播放数 = 统计筛选登陆时间段
+        int todayVideo = 0;
+        BigDecimal todayIncome = BigDecimal.ZERO;
+        DateTime currentDate = DateUtil.date();
+        if (CollUtil.isNotEmpty(adRecords)) {
+            // 默认筛选今日广告记录 并计算前三日收益
+            List<YtDyzAdRecord> ytDyzAdRecords = adRecords.stream()
+                    .filter(s -> DateUtil.isSameDay(currentDate, DateUtil.parseDate(s.getFinishTime())))
+                    .collect(Collectors.toList());
+            todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 统计4天-今日收益=前三日收益
+            if (user.getNearlyIncome() != null && user.getNearlyIncome().compareTo(todayIncome) >= 0) {
+                user.setNearlyIncome(user.getNearlyIncome().subtract(todayIncome));
+            }
+            // 如果传递时间段 则按时间段筛选广告记录
+            if(param.getLastLoginTimeBegin() != null || param.getLastLoginTimeEnd() != null) {
+                ytDyzAdRecords = adRecords;
+                if (param.getLastLoginTimeBegin() != null) {
+                    ytDyzAdRecords = ytDyzAdRecords.stream()
+                            .filter(record -> DateUtil.afterSameDay(
+                                    DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeBegin()))
+                            .collect(Collectors.toList());
                 }
-                // 如果传递时间段 则按时间段筛选广告记录
-                if(param.getLastLoginTimeBegin() != null || param.getLastLoginTimeEnd() != null) {
-                    if (param.getLastLoginTimeEnd() != null) {
-                        ytDyzAdRecords = userAdMap.get(user.getUserId()).stream()
-                                .filter(record -> DateUtil.afterSameDay(
-                                        param.getLastLoginTimeEnd(), DateUtil.parseDate(record.getFinishTime())))
-                                .collect(Collectors.toList());
-                    }
-                    if (param.getLastLoginTimeEnd() != null) {
-                        ytDyzAdRecords = ytDyzAdRecords.stream()
-                                .filter(record -> DateUtil.beforeSameDay(
-                                        param.getLastLoginTimeEnd(), DateUtil.parseDate(record.getFinishTime())))
-                                .collect(Collectors.toList());
-                    }
-                    todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
-                            .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+                if (param.getLastLoginTimeEnd() != null) {
+                    ytDyzAdRecords = ytDyzAdRecords.stream()
+                            .filter(record -> DateUtil.beforeSameDay(
+                                    DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeEnd()))
+                            .collect(Collectors.toList());
                 }
-                todayVideo = (int) ytDyzAdRecords.stream()
-                        .filter(record -> record.getAdSourceType() == AdSourceTypeEnum.rewarded_video.getAdSourceType())
-                        .count();
+                todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
+                        .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
-            user.setTodayVideo(todayVideo);
-            user.setTodayIncome(todayIncome);
+            todayVideo = (int) ytDyzAdRecords.stream()
+                    .filter(record -> record.getAdSourceType() == AdSourceTypeEnum.rewarded_video.getAdSourceType())
+                    .count();
         }
+        user.setTodayVideo(todayVideo);
+        user.setTodayIncome(todayIncome);
     }
 
     /**

yt-question/yt-question-service/src/main/java/com/ytpm/question/controller/UserController.java

@@ -93,66 +93,74 @@ public class UserController {
         //查询主应用
         PageHelper.startPage(param.getPage(), param.getLimit());
         List<YtAppUserListView> result = appUserMapper.queryAll(param);
-        String collect = result.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(","));
-        List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(collect);
-        List<YtDyzLoginRecord> dyzLogins = loginRecordMapper.getLoginRecordByIds(collect);
-        Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream().collect(
-                Collectors.groupingBy(YtDyzAdRecord::getUserId));
-        Map<String, List<YtDyzLoginRecord>> loginMap = dyzLogins.stream().collect(
-                Collectors.groupingBy(YtDyzLoginRecord::getUserId));
-        setUserExtInfo(result, param, userAdMap, loginMap);
+        setUserExtInfo(result, param);
         return ResultTable.resultTableOk(new PageInfo<>(result));
     }
 
     /**
-     * 设置视频记录和登录信息
+     * 记录用户额外信息<br>
+     * 1.查询用户过往登陆信息<br>
+     * 2.查询并计算用户当日收益、当日视频播放数、前三日收益<br>
      */
-    private void setUserExtInfo(List<YtAppUserListView> result,YtAppUserListParam param,
-                                Map<String, List<YtDyzAdRecord>> userAdMap, Map<String, List<YtDyzLoginRecord>> loginMap) {
-        List<YtDyzAdRecord> ytDyzAdRecords;
-        DateTime currentDate = DateUtil.date();
+    private void setUserExtInfo(List<YtAppUserListView> result,YtAppUserListParam param) {
+        String userIds = result.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(","));
+        List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(userIds);
+        List<YtDyzLoginRecord> dyzLogins = loginRecordMapper.getLoginRecordByIds(userIds);
+        Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream()
+                .collect(Collectors.groupingBy(YtDyzAdRecord::getUserId));
+        Map<String, List<YtDyzLoginRecord>> loginMap = dyzLogins.stream()
+                .collect(Collectors.groupingBy(YtDyzLoginRecord::getUserId));
         for (YtAppUserListView user : result) {
             if (loginMap.containsKey(user.getUserId())) {
                 user.setLoginRecordList(loginMap.get(user.getUserId()));
             }
-            //获取当日收益收益 | 当日收益视频播放数 = 统计筛选登陆时间段
-            int todayVideo = 0;
-            BigDecimal todayIncome = BigDecimal.ZERO;
-            if (userAdMap.containsKey(user.getUserId())) {
-                // 默认筛选今日广告记录 并计算前三日收益
-                ytDyzAdRecords = userAdMap.get(user.getUserId()).stream()
-                        .filter(s -> DateUtil.isSameDay(currentDate, DateUtil.parseDate(s.getFinishTime())))
-                        .collect(Collectors.toList());
-                todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
-                        .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-                // 统计4天-今日收益=前三日收益
-                if (user.getNearlyIncome() != null && user.getNearlyIncome().compareTo(todayIncome) >= 0) {
-                    user.setNearlyIncome(user.getNearlyIncome().subtract(todayIncome));
+            computeTodayIncome(user, userAdMap.get(user.getUserId()), param);
+        }
+    }
+
+    /**
+     * 当日收益、当日视频播放数、前三日收益
+     */
+    private void computeTodayIncome(YtAppUserListView user, List<YtDyzAdRecord> adRecords, YtAppUserListParam param) {
+        //获取当日收益收益 | 当日收益视频播放数 = 统计筛选登陆时间段
+        int todayVideo = 0;
+        BigDecimal todayIncome = BigDecimal.ZERO;
+        DateTime currentDate = DateUtil.date();
+        if (CollUtil.isNotEmpty(adRecords)) {
+            // 默认筛选今日广告记录 并计算前三日收益
+            List<YtDyzAdRecord> ytDyzAdRecords = adRecords.stream()
+                    .filter(s -> DateUtil.isSameDay(currentDate, DateUtil.parseDate(s.getFinishTime())))
+                    .collect(Collectors.toList());
+            todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+            // 统计4天-今日收益=前三日收益
+            if (user.getNearlyIncome() != null && user.getNearlyIncome().compareTo(todayIncome) >= 0) {
+                user.setNearlyIncome(user.getNearlyIncome().subtract(todayIncome));
+            }
+            // 如果传递时间段 则按时间段筛选广告记录
+            if(param.getLastLoginTimeBegin() != null || param.getLastLoginTimeEnd() != null) {
+                ytDyzAdRecords = adRecords;
+                if (param.getLastLoginTimeBegin() != null) {
+                    ytDyzAdRecords = ytDyzAdRecords.stream()
+                            .filter(record -> DateUtil.afterSameDay(
+                                    DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeBegin()))
+                            .collect(Collectors.toList());
                 }
-                // 如果传递时间段 则按时间段筛选广告记录
-                if(param.getLastLoginTimeBegin() != null || param.getLastLoginTimeEnd() != null) {
-                    if (param.getLastLoginTimeBegin() != null) {
-                        ytDyzAdRecords = userAdMap.get(user.getUserId()).stream()
-                                .filter(record -> DateUtil.afterSameDay(
-                                        DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeBegin()))
-                                .collect(Collectors.toList());
-                    }
-                    if (param.getLastLoginTimeEnd() != null) {
-                        ytDyzAdRecords = ytDyzAdRecords.stream()
-                                .filter(record -> DateUtil.beforeSameDay(
-                                        DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeEnd()))
-                                .collect(Collectors.toList());
-                    }
-                    todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
-                            .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+                if (param.getLastLoginTimeEnd() != null) {
+                    ytDyzAdRecords = ytDyzAdRecords.stream()
+                            .filter(record -> DateUtil.beforeSameDay(
+                                    DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeEnd()))
+                            .collect(Collectors.toList());
                 }
-                todayVideo = (int) ytDyzAdRecords.stream()
-                        .filter(record -> record.getAdSourceType() == AdSourceTypeEnum.rewarded_video.getAdSourceType())
-                        .count();
+                todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)
+                        .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
             }
-            user.setTodayVideo(todayVideo);
-            user.setTodayIncome(todayIncome);
+            todayVideo = (int) ytDyzAdRecords.stream()
+                    .filter(record -> record.getAdSourceType() == AdSourceTypeEnum.rewarded_video.getAdSourceType())
+                    .count();
         }
+        user.setTodayVideo(todayVideo);
+        user.setTodayIncome(todayIncome);
     }
 
     /**