|
@@ -85,74 +85,17 @@ public class KuaishouOrderLIstGetJob {
|
|
@XxlJob("allOrderGet")
|
|
@XxlJob("allOrderGet")
|
|
public void allOrderGet() throws Exception {
|
|
public void allOrderGet() throws Exception {
|
|
log.info("-------------------------获取快分销订单11、12月数据开始数据开始--------------------------");
|
|
log.info("-------------------------获取快分销订单11、12月数据开始数据开始--------------------------");
|
|
- 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");
|
|
|
|
|
|
+ // List<String> dateList = new ArrayList<>();
|
|
|
|
+ Map<String, String> monthStartAndEnd = DateUtils.getMonthStartAndEnd();
|
|
|
|
+ String firstDay = monthStartAndEnd.get("firstDay");
|
|
|
|
+ String lastDay = monthStartAndEnd.get("lastDay");
|
|
|
|
+ List<String> days = DateUtils.getDays(firstDay, lastDay);
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
- 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++) {
|
|
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++) {
|
|
@@ -176,7 +119,7 @@ public class KuaishouOrderLIstGetJob {
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 快分销-当前月说有数据
|
|
|
|
|
|
+ * 快分销-当前月所有数据
|
|
**/
|
|
**/
|
|
@XxlJob("nowMonthyOrderGet")
|
|
@XxlJob("nowMonthyOrderGet")
|
|
public void nowMonthyOrderGet() throws Exception {
|
|
public void nowMonthyOrderGet() throws Exception {
|