From 29e4976da3187f77e83169be4955269b8f9e7432 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 5 Jan 2026 10:15:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(trade):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=A5=E5=BF=97=E5=88=87=E9=9D=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 ThreadLocal 获取用户类型和用户ID，提高性能
- 添加空值检查确保在 ThreadLocal 未设置时回退到原方法
- 将订单ID检查从 == null 改为 ObjectUtil.isNull 提高一致性
---
 .../order/core/aop/TradeOrderLogAspect.java          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java b/yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
index 5a8d26e94..78ba227c4 100644
--- a/yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
+++ b/yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
@@ -65,11 +65,17 @@ public class TradeOrderLogAspect {
     public void doAfterReturning(JoinPoint joinPoint, TradeOrderLog orderLog) {
         try {
             // 1.1 操作用户
-            Integer userType = getUserType();
-            Long userId = getUserId();
+            Integer userType = USER_TYPE.get();
+            if (ObjectUtil.isNull(userType)) {
+                userType = getUserType();
+            }
+            Long userId = USER_ID.get();
+            if (ObjectUtil.isNull(userId)) {
+                userId = getUserId();
+            }
             // 1.2 订单信息
             Long orderId = ORDER_ID.get();
-            if (orderId == null) { // 如果未设置，只有注解，说明不需要记录日志
+            if (ObjectUtil.isNull(orderId)) { // 如果未设置，只有注解，说明不需要记录日志
                 return;
             }
             Integer beforeStatus = BEFORE_STATUS.get();