|
@@ -37,7 +37,6 @@ public class KuaishouOrderLIstGetJob {
|
|
static ExecutorService fxNowService = Executors.newFixedThreadPool(3);
|
|
static ExecutorService fxNowService = Executors.newFixedThreadPool(3);
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 快分销-招商活动商品数据同步
|
|
* 快分销-招商活动商品数据同步
|
|
**/
|
|
**/
|
|
@@ -115,7 +114,6 @@ public class KuaishouOrderLIstGetJob {
|
|
}
|
|
}
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
for (int z = 0; z < days.size(); z++) {
|
|
for (int z = 0; z < days.size(); z++) {
|
|
String date = days.get(z);
|
|
String date = days.get(z);
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
@@ -132,7 +130,7 @@ public class KuaishouOrderLIstGetJob {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
JSONObject cookieJson = cookies.get(p);
|
|
JSONObject cookieJson = cookies.get(p);
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -160,7 +158,6 @@ public class KuaishouOrderLIstGetJob {
|
|
List<String> days = DateUtils.getDays(monthFirstDay, endDate);
|
|
List<String> days = DateUtils.getDays(monthFirstDay, endDate);
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
for (int z = 0; z < days.size(); z++) {
|
|
for (int z = 0; z < days.size(); z++) {
|
|
String date = days.get(z);
|
|
String date = days.get(z);
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
@@ -181,7 +178,7 @@ public class KuaishouOrderLIstGetJob {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
try {
|
|
try {
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
@@ -211,7 +208,6 @@ public class KuaishouOrderLIstGetJob {
|
|
String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
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++) {
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
@@ -228,7 +224,7 @@ public class KuaishouOrderLIstGetJob {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
JSONObject cookieJson = cookies.get(p);
|
|
JSONObject cookieJson = cookies.get(p);
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -250,7 +246,6 @@ public class KuaishouOrderLIstGetJob {
|
|
String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
|
|
String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
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++) {
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
@@ -267,7 +262,7 @@ public class KuaishouOrderLIstGetJob {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
JSONObject cookieJson = cookies.get(p);
|
|
JSONObject cookieJson = cookies.get(p);
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -296,7 +291,6 @@ public class KuaishouOrderLIstGetJob {
|
|
|
|
|
|
|
|
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- 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++) {
|
|
for (int j = 0; j < minSecList.size(); j++) {
|
|
@@ -313,7 +307,7 @@ public class KuaishouOrderLIstGetJob {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
JSONObject cookieJson = cookies.get(p);
|
|
JSONObject cookieJson = cookies.get(p);
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -337,11 +331,10 @@ public class KuaishouOrderLIstGetJob {
|
|
String date = DateUtils.getNowDate("yyyy-MM-dd");
|
|
String date = DateUtils.getNowDate("yyyy-MM-dd");
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
- Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
Integer nowHour = DateUtils.getNowHour();
|
|
Integer nowHour = DateUtils.getNowHour();
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
for (int i = 0; i < hourList.size(); i++) {
|
|
String hour = hourList.getString(i);
|
|
String hour = hourList.getString(i);
|
|
- Integer integer = Integer.valueOf(hour.replace(":","").replace(" ",""));
|
|
|
|
|
|
+ Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
|
|
if (integer <= nowHour) {
|
|
if (integer <= nowHour) {
|
|
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);
|
|
@@ -357,7 +350,7 @@ public class KuaishouOrderLIstGetJob {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
for (int p = 0; p < cookies.size(); p++) {
|
|
JSONObject cookieJson = cookies.get(p);
|
|
JSONObject cookieJson = cookies.get(p);
|
|
String cookie = cookieJson.getString("cookie");
|
|
String cookie = cookieJson.getString("cookie");
|
|
- ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
|
|
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|