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

---
 .../ghy/web/controller/order/OrderController.java  | 14 +++++---------
 1 file changed, 5 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 6007e69d..deaf0429 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,6 @@ public class OrderController extends BaseController {
                 .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
                 .filter(order -> order.getOrderStatus() != 5).count();
         count += size;
-        logger.info("子单超时数量{}传入的数据{}",count,orderListRequest);
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -987,7 +986,6 @@ public class OrderController extends BaseController {
                 if (CollectionUtils.isEmpty(countParam.getMasterIds())){
                     return count;
                 }
-                logger.info("符合条件主单数据{},{}",countParam,CollectionUtils.isEmpty(countParam.getMasterIds()));
                 List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
                 List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(result)) {
@@ -1000,7 +998,6 @@ public class OrderController extends BaseController {
                 allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
             }
         }
-        logger.info("子单超时返回的主单数量{}子单数据{}",allList.size(),allList);
         // 查询主单
         OrderMaster orderMasterReq = new OrderMaster();
         BeanUtils.copyProperties(orderListRequest, orderMasterReq);
@@ -1090,12 +1087,11 @@ public class OrderController extends BaseController {
         orderMasterReq.setGoodsName(null);
         List<OrderListResponse> masterList = this.getMasterList(orderMasterReq);
         if (orderListRequest.getOrderStatus().equals(1)){
-            orderListResponses = orderListResponses.stream()
-                    .filter(order ->
-                            order.getOrderStatus() != 5 &&
-                                    order.getOrderStatus() != 6
-                    )
-                    .collect(Collectors.toList());
+            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);