|
@@ -516,17 +516,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
//当天数据
|
|
|
JSONObject toData = getOrderRate(today, today, hour, promoterIds, null, mediaId);
|
|
|
|
|
|
- //昨日数据
|
|
|
- JSONObject yesData = getOrderRate(yesterday, yesterday, hour, promoterIds, null, mediaId);
|
|
|
-
|
|
|
//上周当日数据
|
|
|
- JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, promoterIds, null, mediaId);
|
|
|
-
|
|
|
- //日环比 (今天-昨天)/昨天*100%
|
|
|
- data.put("dateOrderRate", getOrderRateValue(toData, yesData));
|
|
|
- data.put("dateAmountRate", getAmountRateValue(toData, yesData));
|
|
|
-
|
|
|
- //周同比
|
|
|
+ JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, promoterIds, null, mediaId); //周同比
|
|
|
data.put("monthOrderRate", getOrderRateValue(toData, weeklyDayData));
|
|
|
data.put("monthAmountRate", getAmountRateValue(toData, weeklyDayData));
|
|
|
|
|
@@ -541,6 +532,16 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
String lastStart = DateUtils.getSubtractTime(date, 13);
|
|
|
//上个近七天的数据
|
|
|
lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, promoterIds, null, mediaId);
|
|
|
+
|
|
|
+ //昨日数据
|
|
|
+ JSONObject yesData = getOrderRate(yesterday, yesterday, hour, promoterIds, null, 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)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
|
inDayData = getOrderRate(startDate, startDate, 23, promoterIds, null, mediaId);
|
|
@@ -562,8 +563,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
lastDayData = getOrderRate(lastStart, lastEnd, hour, promoterIds, null, 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;
|
|
|
}
|
|
|
|