|
@@ -447,7 +447,11 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
JSONObject data = new JSONObject();
|
|
|
List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
- promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ if ("2".equals(mediaId)) {
|
|
|
+ promoterIds = promoterService.selectPromoterIdListByTime(userList, DateUtils.strDateToInt(startDate), DateUtils.strDateToInt(endDate));
|
|
|
+ } else {
|
|
|
+ promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return data;
|
|
|
}
|
|
@@ -718,7 +722,11 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
JSONObject data = new JSONObject();
|
|
|
List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
- promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ if ("2".equals(mediaId)) {
|
|
|
+ promoterIds = promoterService.selectPromoterIdListByTime(userList, DateUtils.strDateToInt(startDate), DateUtils.strDateToInt(endDate));
|
|
|
+ } else {
|
|
|
+ promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return data;
|
|
|
}
|
|
@@ -736,8 +744,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
map.put("promoterIds", promoterIds);
|
|
|
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- map.put("startLong", Long.valueOf(startDate.replace("-","")));
|
|
|
- map.put("endLong", Long.valueOf(endDate.replace("-","")));
|
|
|
+ map.put("startLong", Long.valueOf(startDate.replace("-", "")));
|
|
|
+ map.put("endLong", Long.valueOf(endDate.replace("-", "")));
|
|
|
} else {
|
|
|
map.put("startLong", DateUtils.getStartLongTime(startDate));
|
|
|
map.put("endLong", DateUtils.getEndLongTime(endDate));
|