|
|
@@ -1744,13 +1744,17 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
if (mediaType.equals("1")) {
|
|
|
if (daysBetween <= 1) {
|
|
|
//时报
|
|
|
- listOperate = materialStareMapper.getBytedanceOperateInfoHourly(startDate, entDate, operatorUserIds);
|
|
|
+ listOperate = materialStareMapper.getBytedanceOperateInfoHourly(startDate, entDate, getCurrentHourSafe(), operatorUserIds);
|
|
|
} else {
|
|
|
|
|
|
listOperate = materialStareMapper.getBytedanceOperateInfo(startDate, entDate, operatorUserIds);
|
|
|
}
|
|
|
} else {
|
|
|
- listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate, entDate, operatorUserIds);
|
|
|
+ if (daysBetween <= 1) {
|
|
|
+ listOperate = materialStareMapper.getKuaiShouOperateInfoHourly(startDate, entDate, getCurrentHourSafe(), operatorUserIds);
|
|
|
+ } else {
|
|
|
+ listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate, entDate, operatorUserIds);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//总花费
|
|
|
@@ -1976,6 +1980,14 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
return userIds == null ? 0 : userIds.size();
|
|
|
}
|
|
|
|
|
|
+ private Integer getCurrentHourSafe() {
|
|
|
+ try {
|
|
|
+ return DateUtils.getNowHour();
|
|
|
+ } catch (ParseException e) {
|
|
|
+ throw new RuntimeException("Failed to resolve current hour", e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private long buildAccountQueryStart(long startDate, long lastTimeStart, long startEqually, boolean includeEqually) {
|
|
|
long queryStartDate = Math.min(startDate, lastTimeStart);
|
|
|
if (includeEqually) {
|
|
|
@@ -2103,18 +2115,18 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
private List<KuaiShouOperateVo> loadOperatePageData(String mediaType, long startDate, long endDate, long nowDate, Set<String> userIds) {
|
|
|
if ("1".equals(mediaType)) {
|
|
|
if (startDate == nowDate) {
|
|
|
- return materialStareMapper.getBytedanceOperateInfoHourly(nowDate, nowDate, userIds);
|
|
|
+ return materialStareMapper.getBytedanceOperateInfoHourly(nowDate, nowDate, getCurrentHourSafe(), userIds);
|
|
|
}
|
|
|
return materialStareMapper.getBytedanceOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
if ("16".equals(mediaType)) {
|
|
|
if (startDate == nowDate) {
|
|
|
- return materialStareMapper.getAdqOperateInfoHourly(nowDate, nowDate, userIds);
|
|
|
+ return materialStareMapper.getAdqOperateInfoHourly(nowDate, nowDate, getCurrentHourSafe(), userIds);
|
|
|
}
|
|
|
return materialStareMapper.getAdqOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
if (startDate == nowDate) {
|
|
|
- return materialStareMapper.getKuaiShouOperateInfoHourly(nowDate, nowDate, userIds);
|
|
|
+ return materialStareMapper.getKuaiShouOperateInfoHourly(nowDate, nowDate, getCurrentHourSafe(), userIds);
|
|
|
}
|
|
|
return materialStareMapper.getKuaiShouOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
@@ -2179,16 +2191,19 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
}
|
|
|
if ("1".equals(mediaType)) {
|
|
|
if (daysBetween != null && daysBetween <= 1) {
|
|
|
- return materialStareMapper.getBytedanceOperateInfoHourly(startDate, endDate, userIds);
|
|
|
+ return materialStareMapper.getBytedanceOperateInfoHourly(startDate, endDate, getCurrentHourSafe(), userIds);
|
|
|
}
|
|
|
return materialStareMapper.getBytedanceOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
if ("16".equals(mediaType)) {
|
|
|
if (daysBetween != null && daysBetween <= 1) {
|
|
|
- return materialStareMapper.getAdqOperateInfoHourly(startDate, endDate, userIds);
|
|
|
+ return materialStareMapper.getAdqOperateInfoHourly(startDate, endDate, getCurrentHourSafe(), userIds);
|
|
|
}
|
|
|
return materialStareMapper.getAdqOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
+ if (daysBetween != null && daysBetween <= 1) {
|
|
|
+ return materialStareMapper.getKuaiShouOperateInfoHourly(startDate, endDate, getCurrentHourSafe(), userIds);
|
|
|
+ }
|
|
|
return materialStareMapper.getKuaiShouOperateInfo(startDate, endDate, userIds);
|
|
|
}
|
|
|
|