需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseCountLogic.java

@@ -257,7 +257,7 @@ public class OrderBaseCountLogic {
                 .withSourceFilter(new FetchSourceFilter(new String[]{"create_time"}, null))
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(AggregationBuilders.dateHistogram("WGD")
-                        .field("create_time")
+                        .field("over_time")
                         .calendarInterval(DateHistogramInterval.DAY)
                         .format("yyyy-MM-dd"))
                 .build();
@@ -332,7 +332,7 @@ public class OrderBaseCountLogic {
                                 .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds())))
                         .must(QueryBuilders.rangeQuery("appointment_time")
                         .gte(DateUtil.format(DateUtil.beginOfDay(new Date()),"yyyy-MM-dd HH:mm:ss"))
-                        .lte(DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (6))),"yyyy-MM-dd HH:mm:ss"))))
+                        .lte(DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (7))),"yyyy-MM-dd HH:mm:ss"))))
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(AggregationBuilders.dateHistogram("QTDSM")
                         .field("appointment_time")