From bcffad126c123c08c5e4daec5a6c91c5c2fbd648 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 8 May 2025 15:52:48 +0800
Subject: [PATCH] no message

---
 .../web/controller/order/OrderController.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index deaf0429..8c313000 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -967,6 +967,7 @@ public class OrderController extends BaseController {
                 .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
                 .filter(order -> order.getOrderStatus() != 5).count();
         count += size;
+        logger.info("子单超时数量{}",size);
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -983,6 +984,7 @@ public class OrderController extends BaseController {
                                 .map(OrderMaster::getId)                   // 再提取id
                                 .collect(Collectors.toList())
                 );
+                logger.info("符合条件的主单超时参数{}",countParam);
                 if (CollectionUtils.isEmpty(countParam.getMasterIds())){
                     return count;
                 }
@@ -1086,14 +1088,7 @@ public class OrderController extends BaseController {
 //        orderMasterReq.setExceptOrderMasterIds(masterIdSet);
         orderMasterReq.setGoodsName(null);
         List<OrderListResponse> masterList = this.getMasterList(orderMasterReq);
-        if (orderListRequest.getOrderStatus().equals(1)){
-            orderListResponses = Optional.ofNullable(orderListResponses)
-                    .map(list -> list.stream()
-                            .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
-                            .collect(Collectors.toList()))
-                    .orElseGet(Collections::emptyList);
-            logger.info("处理已完成以及已取消的订单{}",orderListResponses);
-        }
+
 //        allList.addAll(masterList);
         // 超时查询需要排除同个师傅的主单子单同时出现
 //        if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -1119,7 +1114,14 @@ public class OrderController extends BaseController {
 //        } else {
         orderListResponses.addAll(masterList);
 //        }
-
+        if (orderListRequest.getTimeout().equals(1)){
+            if (CollectionUtils.isNotEmpty(orderListResponses)){
+                orderListResponses = orderListResponses.stream()
+                                .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
+                                .collect(Collectors.toList());
+            }
+            logger.info("处理已完成以及已取消的订单{}",orderListResponses);
+        }
         // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
         Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
             @Override