From 96cbd47cb0ea9be390170c9bfff1f1fa2e0b5158 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 8 May 2025 16:08:19 +0800
Subject: [PATCH] no message

---
 .../java/com/ghy/web/controller/order/OrderController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 8c313000..9f54df76 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,7 +967,7 @@ public class OrderController extends BaseController {
                 .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
                 .filter(order -> order.getOrderStatus() != 5).count();
         count += size;
-        logger.info("子单超时数量{}",size);
+        logger.info("子单超时数量{}",count);
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -984,10 +984,10 @@ public class OrderController extends BaseController {
                                 .map(OrderMaster::getId)                   // 再提取id
                                 .collect(Collectors.toList())
                 );
-                logger.info("符合条件的主单超时参数{}",countParam);
                 if (CollectionUtils.isEmpty(countParam.getMasterIds())){
                     return count;
                 }
+                logger.info("符合条件的主单超时参数{},count{}",countParam,count);
                 List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
                 List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(result)) {
@@ -1114,7 +1114,7 @@ public class OrderController extends BaseController {
 //        } else {
         orderListResponses.addAll(masterList);
 //        }
-        if (orderListRequest.getTimeout().equals(1)){
+        if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
             if (CollectionUtils.isNotEmpty(orderListResponses)){
                 orderListResponses = orderListResponses.stream()
                                 .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)