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