From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
index 0bd58bc..0d9b379 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
@@ -5,12 +5,12 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import com.ruoyi.system.api.feignClient.MemberClient;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
import org.springframework.cloud.openfeign.FallbackFactory;
/**
@@ -35,10 +35,12 @@
}
@Override
- public R<List<Member>> getMemberListByIds(Set<Long> memberIdList, String source) {
+ public R<List<Member>> getMemberListByIds(Collection<Long> memberIdList,
+ String source) {
return R.fail("获取用户列表失败:" + cause.getMessage());
}
+ @Override
public R<AppMiniLoginVO> miniLogin(AppMiniLoginDTO appMiniLoginDto)
{
return R.fail("登录用户失败:" + cause.getMessage());
@@ -54,6 +56,17 @@
public R<?> updMembeOne(updMembeOneDTO dMembeOneDTO) {
return R.fail("修改用户等级失败:" + cause.getMessage());
}
+
+ @Override
+ public R<List<Member>> getMemberListByCondition(MemberDTO memberDTO, String source) {
+ return R.fail("获取用户列表失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<List<Member>> getMemberListByLevel(List<String> memberLevelList,
+ String source) {
+ return R.fail("获取用户列表失败:" + cause.getMessage());
+ }
};
}
--
Gitblit v1.7.1