|
@@ -140,7 +140,6 @@ public class TestController {
|
|
|
// System.err.println(itemMap);
|
|
|
|
|
|
|
|
|
-
|
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
|
if (Check.isNull(cookie)) {
|
|
|
log.error("cookie数据为空");
|
|
@@ -164,107 +163,23 @@ 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);
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
|
|
|
- // List<JSONObject> = activityItemListService.getItemMap();
|
|
|
- // System.err.println(map);
|
|
|
-
|
|
|
-// String cookie = ikuaishouSupplyChainService.getCookie();
|
|
|
-// if (Check.isNull(cookie)) {
|
|
|
-// log.error("cookie数据为空");
|
|
|
-// return;
|
|
|
-// }
|
|
|
-//
|
|
|
-// List<Long> activityIdList = activityInfoService.getActivityIdList();
|
|
|
-// if (!Check.isNull(activityIdList)) {
|
|
|
-// for (int i = 0; i < activityIdList.size(); i++) {
|
|
|
-// Long activityId = activityIdList.get(i);
|
|
|
-// activityItemListService.getActivityItemList(cookie, 0, activityId);
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
- /*log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
|
|
|
+ @GetMapping(value = "/getSettlementData")
|
|
|
+ public void getsettlementData(String startDay, String endDay) throws Exception {
|
|
|
+ List<String> days = DateUtils.getDays(startDay, endDay);
|
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
|
- if (Check.isNull(cookie)) {
|
|
|
- log.error("cookie数据为空");
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- List<String> dateList = new ArrayList<>();
|
|
|
- dateList.add("2022-11-01");
|
|
|
- dateList.add("2022-11-02");
|
|
|
- dateList.add("2022-11-03");
|
|
|
- dateList.add("2022-11-04");
|
|
|
- dateList.add("2022-11-05");
|
|
|
- dateList.add("2022-11-06");
|
|
|
- dateList.add("2022-11-07");
|
|
|
- dateList.add("2022-11-08");
|
|
|
- dateList.add("2022-11-09");
|
|
|
- dateList.add("2022-11-10");
|
|
|
- dateList.add("2022-11-11");
|
|
|
- dateList.add("2022-11-12");
|
|
|
- dateList.add("2022-11-13");
|
|
|
- dateList.add("2022-11-14");
|
|
|
- dateList.add("2022-11-15");
|
|
|
- dateList.add("2022-11-16");
|
|
|
- dateList.add("2022-11-17");
|
|
|
- dateList.add("2022-11-18");
|
|
|
- dateList.add("2022-11-19");
|
|
|
- dateList.add("2022-11-20");
|
|
|
- dateList.add("2022-11-21");
|
|
|
- dateList.add("2022-11-22");
|
|
|
- dateList.add("2022-11-23");
|
|
|
- dateList.add("2022-11-24");
|
|
|
- dateList.add("2022-11-25");
|
|
|
- dateList.add("2022-11-26");
|
|
|
- dateList.add("2022-11-27");
|
|
|
- dateList.add("2022-11-28");
|
|
|
- dateList.add("2022-11-29");
|
|
|
- dateList.add("2022-11-30");
|
|
|
- dateList.add("2022-12-01");
|
|
|
- dateList.add("2022-12-02");
|
|
|
- dateList.add("2022-12-03");
|
|
|
- dateList.add("2022-12-04");
|
|
|
- dateList.add("2022-12-05");
|
|
|
- dateList.add("2022-12-06");
|
|
|
- dateList.add("2022-12-07");
|
|
|
- dateList.add("2022-12-08");
|
|
|
- dateList.add("2022-12-09");
|
|
|
- dateList.add("2022-12-10");
|
|
|
- dateList.add("2022-12-11");
|
|
|
- dateList.add("2022-12-12");
|
|
|
- dateList.add("2022-12-13");
|
|
|
- dateList.add("2022-12-14");
|
|
|
- dateList.add("2022-12-15");
|
|
|
- dateList.add("2022-12-16");
|
|
|
- dateList.add("2022-12-17");
|
|
|
- dateList.add("2022-12-18");
|
|
|
- dateList.add("2022-12-19");
|
|
|
- dateList.add("2022-12-20");
|
|
|
- dateList.add("2022-12-21");
|
|
|
- dateList.add("2022-12-22");
|
|
|
- dateList.add("2022-12-23");
|
|
|
- dateList.add("2022-12-24");
|
|
|
- dateList.add("2022-12-25");
|
|
|
- dateList.add("2022-12-26");
|
|
|
- dateList.add("2022-12-27");
|
|
|
- dateList.add("2022-12-28");
|
|
|
- dateList.add("2022-12-29");
|
|
|
- dateList.add("2022-12-30");
|
|
|
- dateList.add("2022-12-31");
|
|
|
-
|
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
|
- for (int z = 0; z < dateList.size(); z++) {
|
|
|
- String date = dateList.get(z);
|
|
|
+ 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");
|
|
@@ -276,11 +191,12 @@ 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);
|
|
|
+ ikuaishouSupplyChainService.getSettlementData(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- }*/
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|