From 49c1552ab77c0aca7f1f726a89fdccb7ddd428b2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 42cc5ac..d455ab3 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
@@ -285,7 +285,7 @@
}
//当前绑定门店的店铺信息
if (user.getShopId() != null) {
- R<Shop> storeById = storeClient.getStoreById(user.getShopId());
+ R<Shop> storeById = shopClient.getShopById(user.getShopId());
if (storeById.getData() != null) {
user.setShopName(storeById.getData().getName());
}
@@ -393,6 +393,20 @@
@ApiParam("每一页数据大小") Integer pageSize,
AppUser appUser) {
IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
+ for (AppUser record : appuserPage.getRecords()) {
+ if (record.getInviteUserId() != null) {
+ AppUser byId1 = appUserService.getById(record.getInviteUserId());
+ if (byId1!=null) {
+ record.setInviteUserName(byId1.getName());
+ }
+ }
+ if (record.getShopId()!=null){
+ R<Shop> shopById = shopClient.getShopById(record.getShopId());
+ if (shopById.getData()!=null){
+ record.setShopName(shopById.getData().getName());
+ }
+ }
+ }
return R.ok(appuserPage);
}
@@ -540,7 +554,7 @@
//推广人
if (byId.getInviteUserId() != null) {
AppUser byId1 = appUserService.getById(byId.getInviteUserId());
- byId1.setInviteUserName(byId1.getInviteUserName());
+ byId.setInviteUserName(byId1.getInviteUserName());
}
//最后下单时间
R<Order> lastOrder = remoteOrderGoodsClient.getLastOrder(id);
--
Gitblit v1.7.1