From 450d98429b33d4433fa4f24a62a47790391459f6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 17:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 13 ++++++++++---
1 files changed, 10 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 c877f44..3d6e55e 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,6 +6,7 @@
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.List;
@@ -23,8 +24,7 @@
public AppUserClient create(Throwable cause) {
return new AppUserClient() {
- @PostMapping("/appUser/getAppUserById")
- @Override
+ @Override
public AppUser getAppUserById(Long id) {
log.error("根据id获取用户失败：{}", cause.getMessage());
throw new RuntimeException("根据id获取用户失败");
@@ -33,7 +33,7 @@
@Override
public R<Void> editAppUserById(AppUser appUser) {
log.error("编辑用户信息失败：{}", cause.getMessage());
- throw new RuntimeException("编辑用户信息失败");
+ return R.fail("编辑用户信息失败");
}
@Override
@@ -42,6 +42,7 @@
throw new RuntimeException("获取优惠券数量失败");
}
+ @GetMapping("/appUserShop/shop/{userId}")
@Override
public R<List<AppUserShop>> getAppUserShop(Long userId) {
log.error("获取用户门店信息失败：{}", cause.getMessage());
@@ -53,6 +54,12 @@
log.error("获取用户祖籍列表失败：{}", cause.getMessage());
throw new RuntimeException("获取用户祖籍列表失败");
}
+
+ @Override
+ public R<AppUser> getSuperiorLeader(Long id) {
+ return R.fail("获取直帮上级用户失败");
+ }
+
@Override
public R<Long> getVipCount(Long userId, Integer vipId) {
log.error("获取直推会员数失败：{}", cause.getMessage());
--
Gitblit v1.7.1