From 1bbfdda2f9efe094f727ff25cc46caac879b4dc2 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 12 Aug 2025 14:32:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改了订单状态查询条件，实现了更灵活的查询方式
- 当 orderStatus 为 -1 时，查询所有非 0 状态的记录
- 当 orderStatus 为 0 或其他值时，按指定状态查询
- 当 orderStatus 为 null 时不添加任何条件，查询所有记录
---
 .../com/klp/service/impl/WmsOrderServiceImpl.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
index 28f5bfc5..5bbe5438 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
@@ -65,17 +65,15 @@ public class WmsOrderServiceImpl implements IWmsOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager());
         // 修改为order_status不是零就查出来
         if (bo.getOrderStatus() != null) {
-            if (bo.getOrderStatus() == 0) {
-                // 当orderStatus为0时，查询所有记录（不添加筛选条件）
+            if (bo.getOrderStatus() == -1) {
+                // 当orderStatus为-1时，查询所有非0状态的记录
+                lqw.ne(WmsOrder::getOrderStatus, 0);
             } else {
-                // 当orderStatus不为0且不为null时，按指定状态查询
+                // 当orderStatus为其他值时（包括0），按指定状态查询
                 lqw.eq(WmsOrder::getOrderStatus, bo.getOrderStatus());
             }
-        } else {
-            // 当orderStatus为null时，查询所有非0状态的记录
-            lqw.ne(WmsOrder::getOrderStatus, 0);
         }
-
+        // 当orderStatus为null时不添加任何条件，查询所有记录
         return lqw;
     }