From fc38c491624cfb2327a7de8f428134dab67b6287 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Fri, 9 May 2025 11:36:51 +0800
Subject: [PATCH] no message

---
 .../quartz/service/impl/OrderServiceImpl.java | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 2a787d34..401690bb 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -823,7 +823,7 @@ public class OrderServiceImpl implements OrderService {
 
     }
 
-    public  long appMixOrderCount(OrderListRequest orderListRequest) {
+    public long appMixOrderCount(OrderListRequest orderListRequest) {
         long count = 0;
 
         // 校验参数
@@ -833,7 +833,10 @@ public class OrderServiceImpl implements OrderService {
         OrderDetail orderDetailReq = new OrderDetail();
         BeanUtils.copyProperties(orderListRequest, orderDetailReq);
         List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
-        count += list.size();
+        long size= list.stream()
+                .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
+                .filter(order -> order.getOrderStatus() != 5).count();
+        count += size;
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -841,9 +844,18 @@ public class OrderServiceImpl implements OrderService {
             OrderMaster param = new OrderMaster();
             param.setWorkerId(orderListRequest.getWorkerId());
             List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param);
-            if(org.apache.commons.collections.CollectionUtils.isNotEmpty(allOrderMaster)){
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(allOrderMaster)) {
                 OrderDetail countParam = new OrderDetail();
-                countParam.setMasterIds(allOrderMaster.stream().map(OrderMaster::getId).collect(Collectors.toList()));
+                countParam.setMasterIds(
+                        allOrderMaster.stream()
+                                .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
+                                .filter(order -> order.getOrderStatus() != 5)
+                                .map(OrderMaster::getId)                   // 再提取id
+                                .collect(Collectors.toList())
+                );
+                if (org.apache.commons.collections.CollectionUtils.isEmpty(countParam.getMasterIds())){
+                    return count;
+                }
                 List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
                 List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
                 if (org.apache.commons.collections.CollectionUtils.isNotEmpty(result)) {
@@ -856,7 +868,6 @@ public class OrderServiceImpl implements OrderService {
                 allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
             }
         }
-
         // 查询主单
         OrderMaster orderMasterReq = new OrderMaster();
         BeanUtils.copyProperties(orderListRequest, orderMasterReq);
@@ -875,7 +886,7 @@ public class OrderServiceImpl implements OrderService {
                 List<OrderDetail> tmpDetailListOfMasters = orderDetailService.selectOrderDetailList(detailAfterListOfMasterQry);
                 List<OrderListResponse> detailListOfMasters = new ArrayList<>();
                 tmpDetailListOfMasters.forEach(model -> {
-                    OrderListResponse response = new OrderListResponse();
+                   OrderListResponse response = new OrderListResponse();
                     BeanUtils.copyProperties(model, response);
                     detailListOfMasters.add(response);
                 });
@@ -888,12 +899,15 @@ public class OrderServiceImpl implements OrderService {
                 if (isKeep) {
                     filteredMasterList.add(master);
                 }
+
             }
             count += filteredMasterList.size();
+            if (filteredMasterList.isEmpty()){
+                count += masterList.size();
+            }
         } else {
             count += masterList.size();
         }
-
         return count;
     }
     public AjaxResult appMixAfterList(@RequestBody OrderListRequest orderListRequest) {