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

---
 .../com/ghy/web/controller/order/OrderController.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 40a99ec7..6007e69d 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
@@ -1048,6 +1048,7 @@ public class OrderController extends BaseController {
     @ResponseBody
     public AjaxResult appMixOrderList(@RequestBody OrderListRequest orderListRequest) {
         List<OrderListResponse> orderListResponses = new ArrayList<>();
+
         logger.info("查询不同订单的传入参数{}",orderListRequest);
         // 校验参数
         Assert.notNull(orderListRequest.getWorkerId(), "师傅id不能为空");
@@ -1088,6 +1089,15 @@ public class OrderController extends BaseController {
 //        orderMasterReq.setExceptOrderMasterIds(masterIdSet);
         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());
+            logger.info("处理已完成以及已取消的订单{}",orderListResponses);
+        }
 //        allList.addAll(masterList);
         // 超时查询需要排除同个师傅的主单子单同时出现
 //        if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {