From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 8e4f588..385fe0d 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,10 +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;
/**
@@ -33,23 +35,38 @@
}
@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());
}
+
@Override
- public R<AppMiniLoginVO> actionMiniLogin(AppMiniLoginDTO appMiniLoginDto) {
- return R.fail("拍卖师登录用户失败:" + cause.getMessage());
+ public R<?> addMemberPoints(MemberPointsDTO memberPointsDTO) {
+ return R.fail("添加用户积分失败:" + cause.getMessage());
+ }
+
+
+ @Override
+ public R<?> updMembeOne(updMembeOneDTO dMembeOneDTO, String source) {
+ return R.fail("修改用户等级失败:" + cause.getMessage());
}
@Override
- public R<AppMiniLoginVO> miniRegister(AppMiniRegisterDTO appUserRegisterDto) {
- return R.fail("注册用户失败:" + cause.getMessage());
+ 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