From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 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 c93b679..e7a43e0 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
@@ -2,9 +2,15 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
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;
/**
* @author zhibing.pu
@@ -28,15 +34,96 @@
@Override
public R<Void> editAppUserById(AppUser appUser) {
log.error("编辑用户信息失败：{}", cause.getMessage());
- throw new RuntimeException("编辑用户信息失败");
+ return R.fail("编辑用户信息失败");
}
@Override
- public R<Long> getCouponCount(Long userId, Long couponId) {
+ public R<Long> getCouponCount(Long userId, Integer couponId) {
log.error("获取优惠券数量失败：{}", cause.getMessage());
throw new RuntimeException("获取优惠券数量失败");
}
+ @GetMapping("/appUserShop/shop/{userId}")
+ @Override
+ public R<List<AppUserShop>> getAppUserShop(Long userId) {
+ log.error("获取用户门店信息失败：{}", cause.getMessage());
+ throw new RuntimeException("获取用户门店信息失败");
+ }
+
+ @Override
+ public R<List<AppUser>> getUserAncestorList(Long id) {
+ log.error("获取用户祖籍列表失败：{}", cause.getMessage());
+ throw new RuntimeException("获取用户祖籍列表失败");
+ }
+
+ @Override
+ public R<AppUser> getSuperiorLeader(Long id) {
+ return R.fail("获取直帮上级用户失败");
+ }
+
+ @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<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> getAppUserByPhone1(String phone) {
+ return R.fail("通过手机号查询用户失败");
+ }
+
+ @Override
+ public R<List<AppUser>> setLowerUserShop(Long userId, Integer shopId) {
+ return R.fail();
+ }
+
+ @Override
+ public List<AppUser> listByIds(List<Long> list) {
+ log.error("获取用户失败: "+cause.getMessage());
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void vipUpgrade(Long appUserId) {
+ R.fail("检查会员等级变更失败：" + cause.getMessage());
+ }
+
+ @Override
+ public void vipDemotion(Long appUserId) {
+ R.fail("检查会员等级降级失败：" + cause.getMessage());
+ }
+
+ @Override
+ public void demotionDetection() {
+ R.fail("用户降级检测失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R clearBindShop(Integer shopId) {
+ return R.fail("清空绑定门店的用户门店数据失败：" + cause.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1