From ff399ed346334267d075d0ae7586936b680650f7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:28:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 67de05c..0324dc7 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
@@ -6,8 +6,10 @@
import com.ruoyi.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import java.util.Collections;
import java.util.List;
/**
@@ -23,7 +25,7 @@
public AppUserClient create(Throwable cause) {
return new AppUserClient() {
- @Override
+ @Override
public AppUser getAppUserById(Long id) {
log.error("根据id获取用户失败：{}", cause.getMessage());
throw new RuntimeException("根据id获取用户失败");
@@ -41,6 +43,7 @@
throw new RuntimeException("获取优惠券数量失败");
}
+ @GetMapping("/appUserShop/shop/{userId}")
@Override
public R<List<AppUserShop>> getAppUserShop(Long userId) {
log.error("获取用户门店信息失败：{}", cause.getMessage());
@@ -59,12 +62,31 @@
}
@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
+ public R<Void> addAppUserShop(AppUserShop appUserShop) {
+ return R.fail("添加失败");
+ }
+ @Override
+ public R<AppUser> getAppUserByPhone(String phone) {
+ return R.fail("通过手机号查询用户失败");
+ }
+
+ @Override
+ public List<AppUser> listByIds(List<String> list) {
+ return Collections.emptyList();
+ }
};
}
}
--
Gitblit v1.7.1