|
@@ -654,18 +654,11 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
//上周的同一天(上个近七天的结束日期)
|
|
//上周的同一天(上个近七天的结束日期)
|
|
|
String todayOfLastWeek = DateUtils.getSubtractTime(date, 7);
|
|
String todayOfLastWeek = DateUtils.getSubtractTime(date, 7);
|
|
|
|
|
|
|
|
- //当天数据
|
|
|
|
|
- JSONObject toData = getOrderRate(today, today, hour, null, itemIds, mediaId);
|
|
|
|
|
-
|
|
|
|
|
- //昨日数据
|
|
|
|
|
- JSONObject yesData = getOrderRate(yesterday, yesterday, hour, null, itemIds, mediaId);
|
|
|
|
|
-
|
|
|
|
|
//上周当日数据
|
|
//上周当日数据
|
|
|
JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
|
|
|
|
|
|
- //日环比 (今天-昨天)/昨天*100%
|
|
|
|
|
- data.put("dateOrderRate", getOrderRateValue(toData, yesData));
|
|
|
|
|
- data.put("dateAmountRate", getAmountRateValue(toData, yesData));
|
|
|
|
|
|
|
+ //当天数据
|
|
|
|
|
+ JSONObject toData = getOrderRate(today, today, hour, null, itemIds, mediaId);
|
|
|
|
|
|
|
|
//周同比
|
|
//周同比
|
|
|
data.put("monthOrderRate", getOrderRateValue(toData, weeklyDayData));
|
|
data.put("monthOrderRate", getOrderRateValue(toData, weeklyDayData));
|
|
@@ -681,6 +674,15 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
String lastStart = DateUtils.getSubtractTime(date, 13); //上个近七天的开始日期
|
|
String lastStart = DateUtils.getSubtractTime(date, 13); //上个近七天的开始日期
|
|
|
//上个近七天的数据
|
|
//上个近七天的数据
|
|
|
lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
|
|
|
+
|
|
|
|
|
+ //昨日数据
|
|
|
|
|
+ JSONObject yesData = getOrderRate(yesterday, yesterday, hour, null, itemIds, mediaId);
|
|
|
|
|
+ //日环比 (今天-昨天)/昨天*100%
|
|
|
|
|
+ data.put("dateOrderRate", getOrderRateValue(toData, yesData));
|
|
|
|
|
+ data.put("dateAmountRate", getAmountRateValue(toData, yesData));
|
|
|
|
|
+ //数据对比
|
|
|
|
|
+ data.put("dataOrderRate", getOrderRateValue(inDayData, lastDayData));
|
|
|
|
|
+ data.put("dataAmountRate", getAmountRateValue(inDayData, lastDayData));
|
|
|
} else if (startDate.equals(endDate) && !startDate.equals(today)) {
|
|
} else if (startDate.equals(endDate) && !startDate.equals(today)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
// startDate 环比 startDate的前一天
|
|
|
inDayData = getOrderRate(startDate, startDate, 23, null, itemIds, mediaId);
|
|
inDayData = getOrderRate(startDate, startDate, 23, null, itemIds, mediaId);
|
|
@@ -701,9 +703,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
|
lastDayData = getOrderRate(lastStart, lastEnd, hour, null, itemIds, mediaId);
|
|
lastDayData = getOrderRate(lastStart, lastEnd, hour, null, itemIds, mediaId);
|
|
|
}
|
|
}
|
|
|
- //数据对比
|
|
|
|
|
- data.put("dataOrderRate", getOrderRateValue(inDayData, lastDayData));
|
|
|
|
|
- data.put("dataAmountRate", getAmountRateValue(inDayData, lastDayData));
|
|
|
|
|
|
|
+ //环比
|
|
|
|
|
+ data.put("dateOrderRate", getOrderRateValue(inDayData, lastDayData));
|
|
|
|
|
+ data.put("dateAmountRate", getAmountRateValue(inDayData, lastDayData));
|
|
|
}
|
|
}
|
|
|
return data;
|
|
return data;
|
|
|
}
|
|
}
|