From ed76f62db481ab1a8c125cf01d5122d1e1606266 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 二月 2025 01:25:09 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 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 df64f87..e139d0f 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
@@ -481,21 +481,13 @@
.ifPresent(superiors -> {
user.setTeacher(superiors.getName());
});
- //当前绑定门店的店铺信息（服务商）
- for (AppUser allSuperior : allSuperiors) {
- List<Shop> shopList = shopClient.getShopByUserId(allSuperior.getId()).getData();
- if (!CollectionUtils.isEmpty(shopList)){
- user.setShopName(shopList.get(0).getName());
- break;
- }
+
+ Shop shop1 = shopClient.getServiceProvider(userId).getData();
+ if(null != shop1){
+ user.setShopName(shop1.getName());
+ user.setShopId(shop1.getId());
}
-// if (user.getShopId() != null) {
-// R<Shop> storeById = shopClient.getShopById(user.getShopId());
-// if (storeById.getData() != null) {
-// Shop shop = storeById.getData();
-// user.setShopName(shop.getName());
-// }
-// }
+
ArrayList<Long> userIds = new ArrayList<>();
userIds.add(userId);
// 获取当前用户的所有下级
@@ -891,11 +883,9 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
AppUser byId = appUserService.getById(id);
- if (byId.getShopId() != null) {
- R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
- if (shopById.getData() != null) {
- byId.setShopName(shopById.getData().getName());
- }
+ Shop shop1 = shopClient.getServiceProvider(id).getData();
+ if(null != shop1){
+ byId.setShopName(shop1.getName());
}
R<List<Shop>> shopByUserId = shopClient.getShopByUserId(id);
if (shopByUserId.getData() != null) {
--
Gitblit v1.7.1