From fe0b9c37a4565505a705ceef90a0b9707e365318 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 24 Sep 2025 15:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=E5=94=AE=E5=90=8E=E6=95=B0=E9=87=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2=E7=94=B3=E8=AF=B7=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E6=9C=AA=E5=AE=A1=E6=A0=B8=E4=BE=9D=E7=84=B6=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/impl/OrderStatusHandlerExecute.java |  2 +-
 .../entity/vo/AfterSaleSearchParams.java      | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
index 3daeb241f..d97c48f05 100644
--- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
@@ -84,4 +84,4 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha
 
         }
     }
-}
+}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
index 369ce2f29..880fde85d 100644
--- a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
@@ -86,20 +86,23 @@ public class AfterSaleSearchParams extends PageVO {
         if (CharSequenceUtil.isNotEmpty(orderSn)) {
             queryWrapper.like("order_sn", orderSn);
         }
-        //按买家查询
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) {
-            queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
-        }
-        //按卖家查询
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) {
-            queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
+        if(UserContext.getCurrentUser() != null){
+            //按买家查询
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) {
+                queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
+            }
+            //按卖家查询
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) {
+                queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
+            }
+
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
+                    && CharSequenceUtil.isNotEmpty(storeId)
+            ) {
+                queryWrapper.eq("store_id", storeId);
+            }
         }
 
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
-                && CharSequenceUtil.isNotEmpty(storeId)
-        ) {
-            queryWrapper.eq("store_id", storeId);
-        }
         if (CharSequenceUtil.isNotEmpty(memberName)) {
             queryWrapper.like("member_name", memberName);
         }