需求

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

@@ -50,8 +50,8 @@ public class OrderBaseCountLogic {
 
         List<PgOrderBase> pgOrderBaseListOver = pgOrderBaseService.lambdaQuery()
                 .select(PgOrderBase::getOrderType, PgOrderBase::getOrderTypeText, PgOrderBase::getCreateTime, PgOrderBase::getId
-                        , PgOrderBase::getOrderStatus,PgOrderBase::getAppointmentTime,PgOrderBase::getOverDate)
-                .between(PgOrderBase::getOverDate, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -8)), new Date())
+                        , PgOrderBase::getOrderStatus,PgOrderBase::getAppointmentTime,PgOrderBase::getOverDate,PgOrderBase::getOverTime)
+                .between(PgOrderBase::getOverTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -8)), new Date())
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PgOrderBase::getCompanyWechatId,adminUser.getCompanyWechatId())
                 .and(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),
                         v -> v.in(PgOrderBase::getWebsitId,adminUser.getAdminWebsitIds()).or().in(PgOrderBase::getCreateWebsitId,adminUser.getAdminWebsitIds()))
@@ -86,8 +86,8 @@ public class OrderBaseCountLogic {
                     item.getCreateTime().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
             ).collect(Collectors.toList()).size();
             xzgdList.add(xzgd);
-            int wgd = pgOrderBaseListOver.stream().filter(item -> item.getOverDate().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
-                    item.getOverDate().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
+            int wgd = pgOrderBaseListOver.stream().filter(item -> item.getOverTime().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
+                    item.getOverTime().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
                     && orderStatus.contains(item.getOrderStatus())
 
             ).collect(Collectors.toList()).size();