需求

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

@@ -64,6 +64,12 @@ public class OrderBaseCountLogic {
         orderStatus.add("YJS");
         orderStatus.add("LRCD");
 
+        List<String> orderStatusQx = new ArrayList<>();
+        orderStatusQx.add("YQX");
+        orderStatusQx.add("FWZT");
+        orderStatusQx.add("YCGB");
+        orderStatusQx.add("FWQX");
+        orderStatusQx.add("FL");
 
         for (int i = 6; i >= 0; i--) {
             Integer day = i*-1;
@@ -79,8 +85,8 @@ public class OrderBaseCountLogic {
             wgdList.add(wgd);
             int jxz = 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())
-                    || item.getOrderStatus().equals(OrderBaseStatusEnum.YQX.getKey()))
+                    && !orderStatus.contains(item.getOrderStatus())
+                    && !orderStatusQx.contains(item.getOrderStatus())
             ).collect(Collectors.toList()).size();
             jxzList.add(jxz);