Merge branch 'master-order-statistics' into base-modify

# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/BaseOrderStatisticsJobHandler.java

@@ -57,12 +57,14 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
             }
             log.info("获取到当前需要执行的日期,距离当前时间的天数集合" + arrayList);
             XxlJobLogger.log("获取到当前需要执行的日期,距离当前时间的天数集合" + arrayList);
+            DateTime now = DateTime.now();
+
             for (Integer day : arrayList) {
                 boolean flag = statisticsBiz.statisticalOrder(day);
-                log.info("执行状态:" + day+"="+flag);
-                XxlJobLogger.log("执行状态:" + day+"="+flag);
+                DateTime dateTime = now.plusDays(-day);
+                log.info("执行状态:" + dateTime.toString("yyyy-MM-dd")+"="+flag);
+                XxlJobLogger.log("执行状态:" + dateTime.toString("yyyy-MM-dd")+"="+flag);
             }
-
             return new ReturnT<>(ReturnT.SUCCESS_CODE,"执行成功");
         } catch (Exception e) {
             XxlJobLogger.log(e);
@@ -102,10 +104,11 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
             maxDate=currentTime;
         }
 
-        //距离今天的最小天数差
-        int minDay = (int) ((currentTime-minDate)/(24*60*60*1000));
+
         //距离今天的最大天数差
-        int maxDay = (int) ((currentTime-maxDate)/(24*60*60*1000));
+        int maxDay = (int) ((currentTime-minDate)/(24*60*60*1000));
+        //距离今天的最小天数差
+        int minDay = (int) ((currentTime-maxDate)/(24*60*60*1000));
 
 
         return getListByMinDayAndMaxDay(minDay,maxDay);
@@ -121,7 +124,7 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
 
     private ArrayList<Integer> getListByMinDayAndMaxDay(int minDay,int maxDay){
         ArrayList<Integer> arrayList = Lists.newArrayList();
-        for (int day=maxDay;day<=maxDay;day++){
+        for (int day=maxDay;day>=minDay;day--){
             arrayList.add(day);
         }
         return arrayList;

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -54,7 +54,7 @@ public class ServiceTest {
     }
 
     @Test
-    public void test3() {
+    public void test3()  {
         DateTime dateTime = DateTime.parse("2019-10-10");
         Date date = dateTime.toDate();
         DateTime dateTime1 = DateTime.parse("2019-12-10");
@@ -67,6 +67,8 @@ public class ServiceTest {
 
 
     @Test
+    public void handlerTeset()  {
+        handler.execute(null);
     public void handlerTeset() {
         handler.execute("2019-10-12");
     }