From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
index cf6e539..94369ad 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
@@ -80,7 +80,7 @@
}
@Override
- public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(MgtBaseBathDto mgtBaseBathDto) {
+ public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(String userIds) {
return R.fail("获取用户列表失败:" + throwable.getMessage());
}
@@ -89,10 +89,6 @@
return R.fail("获取用户列表失败:" + throwable.getMessage());
}
- @Override
- public R<MgtBulletinBoardVo> boardMemberTotal() {
- return null;
- }
@Override
public R<List<Long>> listUserIdByAge(MgtActivityAgeDto mgtActivityAgeDto) {
@@ -149,7 +145,20 @@
return R.fail("获取平台生日卡失败:" + throwable.getMessage());
}
+ @Override
+ public R verifyPrize(MerVerifyPrizeFinalDto merVerifyPrizeFinalDto) {
+ return R.fail("核销奖品失败:" + throwable.getMessage());
+ }
+ @Override
+ public R<List<Long>> listUserIdByAgeType(Integer ageType) {
+ return R.fail("获取用户id列表失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<MgtBulletinBoardVo> boardMemberTotal(BoardMemberTotalDto boardMemberTotalDto) {
+ return R.fail(throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1