Merge branch 'master-order-statistics' into dev

# 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

@@ -23,7 +23,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 每天2定时统计前一天的数据
+ * 每天2点定时统计前一天的数据
  *
  * @author Administrator
  */
@@ -103,9 +103,9 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
         }
 
         //距离今天的最小天数差
-        int minDay = (int) ((minDate-currentTime)/(24*60*60*1000));
+        int minDay = (int) ((currentTime-minDate)/(24*60*60*1000));
         //距离今天的最大天数差
-        int maxDay = (int) ((maxDate-currentTime)/(24*60*60*1000));
+        int maxDay = (int) ((currentTime-maxDate)/(24*60*60*1000));
 
 
         return getListByMinDayAndMaxDay(minDay,maxDay);

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

 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
-import com.xxfc.platform.order.biz.OrderStatisticsBiz;
-import com.xxfc.platform.order.pojo.HomePageOrderData;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,6 +27,8 @@ public class ServiceTest {
     @Autowired
     private OrderStatisticsBiz statisticsBiz;
 
+    @Autowired
+    private BaseOrderStatisticsJobHandler handler;
 
     @Test
     public void testSchedu(){
@@ -68,4 +68,12 @@ public class ServiceTest {
         System.out.println(totalOrder);
 
     }
+
+
+    @Test
+    public void handlerTeset()  {
+        handler.execute("2019-10-12");
+    }
+
+
 }