From 1d4473f81abe4ef200f23b781756a7da689dc718 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 16:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
index 384ee70..ca8a349 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -61,20 +62,43 @@
 			}
 
 			@Override
+			public R<List<AppUser>> getTopUsers() {
+				log.error("获取用户列表失败:{}", cause.getMessage());
+				throw new RuntimeException("获取用户列表失败");
+			}
+
+			@Override
 			public R<Long> getVipCount(Long userId, Integer vipId) {
 				log.error("获取直推会员数失败:{}", cause.getMessage());
 				throw new RuntimeException("获取直推会员数失败");
 			}
-
-            @Override
+			
+			@Override
+			public R<List<AppUser>> getAppUserByName(String name) {
+				return R.fail("根据用户名称模糊搜索用户列表失败:" + cause.getMessage());
+			}
+			
+			@Override
+			public R<List<AppUser>> getAppUserByPhone(String phone) {
+				return R.fail("根据用户电话模糊搜索用户列表失败:" + cause.getMessage());
+			}
+			
+			
+			@Override
             public R<Void> addAppUserShop(AppUserShop appUserShop) {
                 return R.fail("添加失败");
             }
 
 			@Override
-			public R<AppUser> getAppUserByPhone(String phone) {
+			public R<AppUser> getAppUserByPhone1(String phone) {
 				return R.fail("通过手机号查询用户失败");
 			}
+
+			@Override
+			public List<AppUser> listByIds(List<Long> list) {
+				log.error("获取用户失败: "+cause.getMessage());
+				return Collections.emptyList();
+			}
 		};
 	}
 }

--
Gitblit v1.7.1