|
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -270,37 +271,52 @@ 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();
|
|
JSONArray hours = new JSONArray();
|
|
- hours.add(hours);
|
|
|
|
- if(nowHour >= 1){
|
|
|
|
- hours.add(nowHour - 1);
|
|
|
|
|
|
+ hours.add(nowHour);
|
|
|
|
+ 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++) {
|
|
|
|
|
|
+ for (int i = 0; i < hours.size(); i++) {
|
|
Integer hour = hours.getInteger(i);
|
|
Integer hour = hours.getInteger(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);
|
|
|
|
|
|
+ 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);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ public static void main(String[] args) {
|
|
|
|
+ Integer nowHour = null;
|
|
|
|
+ try {
|
|
|
|
+ nowHour = DateUtils.getNowHour();
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ List<Integer> hours = new ArrayList<>();
|
|
|
|
+ hours.add(nowHour);
|
|
|
|
+ if (nowHour >= 1) {
|
|
|
|
+ hours.add(nowHour - 1);
|
|
|
|
+ }
|
|
|
|
+ System.err.println(hours);
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 当天前前小时数据获取
|
|
* 当天前前小时数据获取
|
|
**/
|
|
**/
|
|
@@ -344,27 +360,4 @@ public class KuaishouOrderLIstGetJob {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- public static void main(String[] args) throws ParseException {
|
|
|
|
- String date = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
|
- JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
|
|
- JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
|
|
- 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();
|
|
|
|
- // ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
}
|
|
}
|