|
@@ -45,12 +45,16 @@ public class KuaishouOrderLIstGetJob {
|
|
|
log.error("cookie数据为空");
|
|
|
return;
|
|
|
}
|
|
|
+ Map<Long, Integer> itemMap = activityInfoService.getItemMap();
|
|
|
|
|
|
- List<Long> activityIdList = activityInfoService.getActivityIdList();
|
|
|
- if(!Check.isNull(activityIdList)){
|
|
|
+ List<JSONObject> 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);
|
|
|
+ JSONObject jsonObject = activityIdList.get(i);
|
|
|
+ Long activityId = jsonObject.getLong("activityId");
|
|
|
+ Integer activityStatus = jsonObject.getInteger("activityStatus");
|
|
|
+
|
|
|
+ activityItemListService.getActivityItemList(cookie, 0, activityId,activityStatus,itemMap);
|
|
|
Thread.sleep(1000);
|
|
|
}
|
|
|
|
|
@@ -58,7 +62,6 @@ public class KuaishouOrderLIstGetJob {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
@@ -85,7 +88,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
@XxlJob("allOrderGet")
|
|
|
public void allOrderGet() throws Exception {
|
|
|
log.info("-------------------------获取快分销订单上个月数据开始数据开始--------------------------");
|
|
|
- // List<String> dateList = new ArrayList<>();
|
|
|
+ // List<String> dateList = new ArrayList<>();
|
|
|
Map<String, String> monthStartAndEnd = DateUtils.getMonthStartAndEnd();
|
|
|
String firstDay = monthStartAndEnd.get("firstDay");
|
|
|
String lastDay = monthStartAndEnd.get("lastDay");
|
|
@@ -109,7 +112,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -151,7 +154,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -190,7 +193,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -227,7 +230,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -260,7 +263,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -296,7 +299,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
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);
|
|
|
}
|
|
|
}
|
|
|
|