|
@@ -133,7 +133,7 @@ public class TestController {
|
|
|
private IKuaiShouActivityItemListService activityItemListService;
|
|
|
|
|
|
@GetMapping(value = "/getData")
|
|
|
- public void getDate() throws Exception {
|
|
|
+ public void getDate(String startDate, String endDate) throws Exception {
|
|
|
|
|
|
|
|
|
// Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
@@ -144,7 +144,7 @@ public class TestController {
|
|
|
log.error("cookie数据为空");
|
|
|
return;
|
|
|
}
|
|
|
- List<String> days = DateUtils.getDays("2023-01-15", "2023-01-31");
|
|
|
+ List<String> days = DateUtils.getDays(startDate, endDate);
|
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
@@ -163,7 +163,7 @@ public class TestController {
|
|
|
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,itemMap);
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -180,7 +180,7 @@ public class TestController {
|
|
|
for (int z = 0; z < days.size(); z++) {
|
|
|
String date = days.get(z);
|
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
|
- String hour = hourList.getString(i);
|
|
|
+ String hour = hourList.getString(i);
|
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
|
JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
|
String startTime = minSecJson.getString("startTime");
|