需求

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

@@ -54,6 +54,17 @@ public class OrderBaseCountLogic {
         List<Integer> wgdList = new ArrayList<>();
         List<Integer> jxzList = new ArrayList<>();
         List<Integer> qtsmList = new ArrayList<>();
+
+        List<String> orderStatus = new ArrayList<>();
+
+        orderStatus.add("YWG");
+        orderStatus.add("GCSZX");
+        orderStatus.add("WDWG");
+        orderStatus.add("YWGO");
+        orderStatus.add("YJS");
+        orderStatus.add("LRCD");
+
+
         for (int i = 6; i >= 0; i--) {
             Integer day = i*-1;
             int xzgd = pgOrderBaseList.stream().filter(item -> item.getCreateTime().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
@@ -62,7 +73,7 @@ public class OrderBaseCountLogic {
             xzgdList.add(xzgd);
             int wgd = pgOrderBaseList.stream().filter(item -> item.getCreateTime().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
                     item.getCreateTime().after(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), (day))))
-                    && (item.getOrderStatus().equals(OrderBaseStatusEnum.YWG.getKey()) || item.getOrderStatus().equals(OrderBaseStatusEnum.YJS.getKey()))
+                    && orderStatus.contains(item.getOrderStatus())
 
             ).collect(Collectors.toList()).size();
             wgdList.add(wgd);