소스 검색

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

hidewnd 3 주 전
부모
커밋
d0c8ff3c18
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      yt-question/yt-question-service/src/main/java/com/ytpm/question/controller/UserController.java

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

@@ -131,16 +131,16 @@ public class UserController {
                 }
                 // 如果传递时间段 则按时间段筛选广告记录
                 if(param.getLastLoginTimeBegin() != null || param.getLastLoginTimeEnd() != null) {
-                    if (param.getLastLoginTimeEnd() != null) {
+                    if (param.getLastLoginTimeBegin() != null) {
                         ytDyzAdRecords = userAdMap.get(user.getUserId()).stream()
                                 .filter(record -> DateUtil.afterSameDay(
-                                        param.getLastLoginTimeEnd(), DateUtil.parseDate(record.getFinishTime())))
+                                        DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeBegin()))
                                 .collect(Collectors.toList());
                     }
                     if (param.getLastLoginTimeEnd() != null) {
                         ytDyzAdRecords = ytDyzAdRecords.stream()
                                 .filter(record -> DateUtil.beforeSameDay(
-                                        param.getLastLoginTimeEnd(), DateUtil.parseDate(record.getFinishTime())))
+                                        DateUtil.parseDate(record.getFinishTime()), param.getLastLoginTimeEnd()))
                                 .collect(Collectors.toList());
                     }
                     todayIncome = ytDyzAdRecords.stream().map(YtDyzAdRecord::getRevenue)