修改订单统计

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

@@ -2,6 +2,8 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.db.PageResult;
+import com.github.pagehelper.Page;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -88,12 +90,12 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         return result;
     }
 
-    public List<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) {
+    public PageResult<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) {
         List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
 
         //按每天分类
         if (CollectionUtil.isEmpty(membersOrderList)) {
-            return Lists.newArrayList();
+            return null;
         }
         //按每天分类
         if (CollectionUtil.isEmpty(memberLevels)) {
@@ -160,8 +162,18 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                 }
             }
         }
-        return arrayList;
+         //进行分页处理
 
+
+        return  pagingProcessing(query,arrayList);
+
+    }
+
+    private PageResult pagingProcessing(OrderQuery query, ArrayList<MembersOrderDto> arrayList) {
+        PageResult pageResult = (PageResult) arrayList;
+        pageResult.setPage(query.getPage());
+        pageResult.setPageSize(query.getLimit());
+        return pageResult;
     }
 
     private String timeStampConversionToString(Long startTime) {