|
@@ -445,7 +445,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
//渠道数据
|
|
|
private JSONObject getOrderDataByChannel(List<Long> userList, String startDate, String endDate) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
- List<Long> promoterIds = null;
|
|
|
+ List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
promoterIds = promoterService.selectPromoterIdList(userList);
|
|
|
}
|
|
@@ -525,7 +525,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
- private JSONObject getOrderRate(String startDate, String endDate, int hour, List<Long> promoterIds, List<Long> itemIds) {
|
|
|
+ private JSONObject getOrderRate(String startDate, String endDate, int hour, List<String> promoterIds, List<Long> itemIds) {
|
|
|
Long startHourTemp = DateUtils.getStartLongTime(startDate); // startDate开始时间戳
|
|
|
Long endHourTemp = DateUtils.getNowEndHourTemp(endDate, hour); // endDate结束时间戳
|
|
|
return supplyChainService.selectOrderRate(promoterIds, itemIds, startHourTemp, endHourTemp);
|
|
@@ -692,7 +692,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
// 渠道—数据分析
|
|
|
private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
- List<Long> promoterIds = null;
|
|
|
+ List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
promoterIds = promoterService.selectPromoterIdList(userList);
|
|
|
}
|