|
@@ -269,14 +269,23 @@ public class KuaishouOrderLIstGetJob {
|
|
}
|
|
}
|
|
String date = DateUtils.getNowDate("yyyy-MM-dd");
|
|
String date = DateUtils.getNowDate("yyyy-MM-dd");
|
|
Integer nowHour = DateUtils.getNowHour();
|
|
Integer nowHour = DateUtils.getNowHour();
|
|
|
|
+ JSONArray hours = new JSONArray();
|
|
|
|
+ hours.add(hours);
|
|
|
|
+ if(nowHour >= 1){
|
|
|
|
+ hours.add(nowHour - 1);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
+ for (int i = 0; i <hours.size() ; i++) {
|
|
|
|
+ Integer hour = hours.getInteger(i);
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
String startTime = minSecJson.getString("startTime");
|
|
String startTime = minSecJson.getString("startTime");
|
|
String endTime = minSecJson.getString("endTime");
|
|
String endTime = minSecJson.getString("endTime");
|
|
- String start = date + " " + nowHour + ":" + startTime;
|
|
|
|
- String end = date + " " + nowHour + ":" + endTime;
|
|
|
|
|
|
+ String start = date + " " + hour + ":" + startTime;
|
|
|
|
+ String end = date + " " + hour + ":" + endTime;
|
|
System.err.println("开始时间:" + start);
|
|
System.err.println("开始时间:" + start);
|
|
System.err.println("结束时间:" + end);
|
|
System.err.println("结束时间:" + end);
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
@@ -287,7 +296,7 @@ public class KuaishouOrderLIstGetJob {
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|