Merge branch 'master-order-statistics' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/OrderQuery.java

 package com.xxfc.platform.order.pojo;
 
 import lombok.Data;
+import org.joda.time.DateTime;
 
 /**
  * 会员订单统计条件
@@ -26,4 +27,10 @@ public class   OrderQuery {
      */
     private  Integer type=1;
 
+    public Long getEndTime() {
+        if (endTime!=null) {
+            endTime=endTime+(24*60*60*1000);
+        }
+        return endTime;
+    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

@@ -95,7 +95,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
         //按每天分类
         if (CollectionUtil.isEmpty(membersOrderList)) {
-            return null;
+            return  PageResult.nowPageResult(query.getPage(),query.getLimit(),Lists.newArrayList());
         }
         //按每天分类
         if (CollectionUtil.isEmpty(memberLevels)) {