Jelajahi Sumber

快分销数据调整

yumeng 2 tahun lalu
induk
melakukan
1ad4401dab

+ 30 - 6
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -357,10 +357,6 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
 
-    public static void main(String[] args) {
-        String date = tempToDate(1656518400000L);
-        System.err.println(date);
-    }
 
     /**
      * 以字符形式表示的时间戳
@@ -903,8 +899,6 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
 
-
-
     /**
      * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
      * HH:mm:ss“ * @param text String类型的时间值
@@ -1121,6 +1115,36 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
 
+    public static Map<String, String> getMonthStartAndEnd() {
+        Map<String, String> map = new HashMap<>();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); //格式化时间
+        Calendar cal_1 = Calendar.getInstance();//获取当前日期
+        cal_1.add(Calendar.MONTH, -1);
+        cal_1.set(Calendar.DAY_OF_MONTH, 1);//设置为1号
+        cal_1.set(Calendar.HOUR_OF_DAY, 0);
+        cal_1.set(Calendar.MINUTE, 0);
+        cal_1.set(Calendar.SECOND, 0);
+        String firstDay = format.format(cal_1.getTime());
+        map.put("firstDay", firstDay);
+
+        Calendar cal_2 = Calendar.getInstance();
+        cal_2.set(Calendar.DAY_OF_MONTH, 0);//设置为1号,当前日期既为本月第一天
+        cal_2.set(Calendar.HOUR_OF_DAY, 23);
+        cal_2.set(Calendar.MINUTE, 59);
+        cal_2.set(Calendar.SECOND, 59);
+        String lastDay = format.format(cal_2.getTime());
+        map.put("lastDay", lastDay);
+        return map;
+    }
+
+    public static void main(String[] args) {
+        Map<String, String> monthStartAndEnd = DateUtils.getMonthStartAndEnd();
+        String firstDay = monthStartAndEnd.get("firstDay");
+        String lastDay = monthStartAndEnd.get("lastDay");
+        List<String> days = DateUtils.getDays(firstDay, lastDay);
+        System.err.println(days);
+    }
+
     public static String getNowDate(String format) {
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         Date date = new Date();

+ 8 - 65
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -85,74 +85,17 @@ public class KuaishouOrderLIstGetJob {
     @XxlJob("allOrderGet")
     public void allOrderGet() throws Exception {
         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();
         JSONArray hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
         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++) {
                 String hour = hourList.getString(i);
                 for (int j = 0; j < minSecList.size(); j++) {
@@ -176,7 +119,7 @@ public class KuaishouOrderLIstGetJob {
 
 
     /**
-     * 快分销-当前月有数据
+     * 快分销-当前月有数据
      **/
     @XxlJob("nowMonthyOrderGet")
     public void nowMonthyOrderGet() throws Exception {