From 371a7ed611e5e76af30af59e7247be6192f63f06 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 20:54:01 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 5e02069..ad8cff5 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -23,6 +23,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.redis.annotation.DistributedLock;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
@@ -703,14 +704,11 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
Integer shopId = null;
Set<Long> userId = null;
- Set<Long> userIdT = null;
if(data.getRoleType() == 2){
shopId = data.getObjectId();
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
- UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);
- userStatistics.setShopUser(userStatistics1.getShopUser());
return R.ok(userStatistics);
}
--
Gitblit v1.7.1