From d6220bfca0d5bcb7b10e7c69bceffe1c08905301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Sun, 17 Mar 2024 12:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=AB=99bug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8Dv3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/service/impl/RecycleOrderServiceImpl.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index b5bd91e..57a1704 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -70,8 +70,12 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             if (!OrderStatusEnum.PENDING.equals(recycleOrderQuery.getStatus())) {
                 wrapper.eq(RecycleOrder::getStaffsId, recycleOrderQuery.getUserId());
             }
-            // 必须有订单状态查询
-            wrapper.eq(true, RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
+            // 订单状态查询
+            if (OrderStatusEnum.UNPROCESSED.equals(recycleOrderQuery.getStatus())) { // 进行中
+                wrapper.in(RecycleOrder::getOrderStatus, OrderStatusEnum.UNPROCESSED.getCode(), OrderStatusEnum.RECYCLING.getCode());
+            } else {
+                wrapper.eq(RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
+            }
         }
         wrapper.eq(StrUtil.isNotEmpty(recycleOrderQuery.getId()), RecycleOrder::getId, recycleOrderQuery.getId());
         Page<RecycleOrder> pageDO = recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime).buildPage();