|
@@ -89,7 +89,8 @@ public class KuaishouOrderLIstGetJob {
|
|
|
String end = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
|
|
|
List<String> days = DateUtils.getDays(start, end);
|
|
|
System.err.println(days);
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 快分销-11、12月所有数据
|
|
|
**/
|
|
@@ -139,7 +140,6 @@ public class KuaishouOrderLIstGetJob {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 快分销-当前月所有数据
|
|
|
**/
|
|
@@ -310,8 +310,6 @@ public class KuaishouOrderLIstGetJob {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 当天前前小时数据获取
|
|
|
**/
|
|
@@ -330,23 +328,27 @@ public class KuaishouOrderLIstGetJob {
|
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
+ Integer nowHour = DateUtils.getNowHour();
|
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
|
String hour = hourList.getString(i);
|
|
|
- for (int j = 0; j < minSecList.size(); j++) {
|
|
|
- JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
|
- String startTime = minSecJson.getString("startTime");
|
|
|
- String endTime = minSecJson.getString("endTime");
|
|
|
- String start = date + hour + startTime;
|
|
|
- String end = date + hour + endTime;
|
|
|
- System.err.println("开始时间:" + start);
|
|
|
- System.err.println("结束时间:" + end);
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- Long orderCreateTimeStart = sdf.parse(start).getTime();
|
|
|
- Long orderCreateTimeEnd = sdf.parse(end).getTime();
|
|
|
- for (int p = 0; p < cookies.size(); p++) {
|
|
|
- JSONObject cookieJson = cookies.get(p);
|
|
|
- String cookie = cookieJson.getString("cookie");
|
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
+ Integer integer = Integer.valueOf(hour);
|
|
|
+ if (integer <= nowHour) {
|
|
|
+ for (int j = 0; j < minSecList.size(); j++) {
|
|
|
+ JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
|
+ String startTime = minSecJson.getString("startTime");
|
|
|
+ String endTime = minSecJson.getString("endTime");
|
|
|
+ String start = date + hour + startTime;
|
|
|
+ String end = date + hour + endTime;
|
|
|
+ System.err.println("开始时间:" + start);
|
|
|
+ System.err.println("结束时间:" + end);
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ Long orderCreateTimeStart = sdf.parse(start).getTime();
|
|
|
+ Long orderCreateTimeEnd = sdf.parse(end).getTime();
|
|
|
+ for (int p = 0; p < cookies.size(); p++) {
|
|
|
+ JSONObject cookieJson = cookies.get(p);
|
|
|
+ String cookie = cookieJson.getString("cookie");
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|