Merge branch 'master-order-statistics' into dev

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

@@ -10,8 +10,8 @@ import org.joda.time.DateTime;
 @Data
 public class   OrderQuery {
 
-    private  Integer page=1;
-    private  Integer limit=10;
+    private Integer page = 1;
+    private Integer limit = 10;
 
     /**
      * 查询开始时间
@@ -25,12 +25,6 @@ public class   OrderQuery {
     /**
      * 1.按每日统计,2.按每周统计,3.按每月统计
      */
-    private  Integer type=1;
+    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/rest/background/OrderStatisticsController.java

@@ -159,7 +159,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @PostMapping("/order")
     @ApiOperation(value = "会员统计")
     public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
-
+        if (query.getEndTime()!=null) {
+            query.setEndTime(query.getStartTime()+(24*60*60*1000));
+        }
         //获取会员等级信息
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();
         //获取会员订单统计信息
@@ -170,7 +172,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @PostMapping("/excel")
     @ApiOperation(value = "下载excel表")
     public void downloadExcel(@RequestBody OrderQuery query) throws Exception {
-
+        if (query.getEndTime()!=null) {
+            query.setEndTime(query.getStartTime()+(24*60*60*1000));
+        }
         // 通过工具类创建writer，默认创建xls格式
         ExcelWriter writer = ExcelUtil.getWriter(true);
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();