需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -594,7 +594,7 @@ public class BigLogic {
                 .notIn(PgOrderBase::getOrderStatus, "YQX","FWZT","YCGB","FWQX","FL")
                 .between(PgOrderBase::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(PgOrderBase::getOrderSmallTypeText, PgOrderBase::getId, PgOrderBase::getTotalNum, PgOrderBase::getUndoneNum, PgOrderBase::getCreateTime,
-                        PgOrderBase::getSaleType,PgOrderBase::getOverTime).list();
+                        PgOrderBase::getSaleType,PgOrderBase::getOverTime,PgOrderBase::getWebsitOverTime,PgOrderBase::getOrderStatus).list();
 
         List<LargeWorkerOrderDateBean> largeWorkerOrderDateBeans = new ArrayList<>();
 
@@ -621,8 +621,9 @@ public class BigLogic {
 
                 DateTime endDay = DateUtil.endOfDay(startDay);
 
-                Integer integer = pgOrderBases.stream().filter(item -> item.getOverTime().before(endDay)
-                        && item.getOverTime().after(startDay) && status.contains(item.getOrderStatus())
+                Integer integer = pgOrderBases.stream().filter(item ->  status.contains(item.getOrderStatus())
+                        && item.getOverTime().before(endDay)
+                        && item.getOverTime().after(startDay)
                         && item.getOrderSmallTypeText().equals(largeWorkerOrderDateBean.getLx())
                 )
                         .map(PgOrderBase::getTotalNum).reduce(Integer::sum).orElse(0);