BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7041baf17847535309670fda4f6f36c2829263d1

Authored by YunaiV
1 parent 32e9c17f

fix：【mall】交易日志、售后日志，增加 USER_ID 的读取

Inline Side-by-side
Showing 2 changed files with 6 additions and 0 deletions
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
  View file @7041baf
@@ -113,6 +113,9 @@ public class AfterSaleLogAspect { @@ -113,6 +113,9 @@ public class AfterSaleLogAspect {
113 * @return 用户类型 113 * @return 用户类型
114 */ 114 */
115 private static Long getUserId() { 115 private static Long getUserId() {
  116 + if (USER_ID.get() != null) {
  117 + return USER_ID.get();
  118 + }
116 return ObjectUtil.defaultIfNull(WebFrameworkUtils.getLoginUserId(), TradeOrderLogDO.USER_ID_SYSTEM); 119 return ObjectUtil.defaultIfNull(WebFrameworkUtils.getLoginUserId(), TradeOrderLogDO.USER_ID_SYSTEM);
117 } 120 }
118 121
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
  View file @7041baf
@@ -109,6 +109,9 @@ public class TradeOrderLogAspect { @@ -109,6 +109,9 @@ public class TradeOrderLogAspect {
109 * @return 用户类型 109 * @return 用户类型
110 */ 110 */
111 private static Long getUserId() { 111 private static Long getUserId() {
  112 + if (USER_ID.get() != null) {
  113 + return USER_ID.get();
  114 + }
112 return ObjectUtil.defaultIfNull(WebFrameworkUtils.getLoginUserId(), TradeOrderLogDO.USER_ID_SYSTEM); 115 return ObjectUtil.defaultIfNull(WebFrameworkUtils.getLoginUserId(), TradeOrderLogDO.USER_ID_SYSTEM);
113 } 116 }
114 117