From 49c5117caef44d1e817d2ef701529dfaf1443467 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 16 六月 2025 16:20:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 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 ec73b0e..75e9145 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 @@ -119,22 +119,28 @@ public R<Integer> getUnReplaySuggestVo() { return null; } - + @Override public R<MemberGiftRecord> getVerifyPrize(String verifyPrize) { return R.fail("获取核销奖品信息失败:" + throwable.getMessage()); } - + + + @Override + public R<MemberGiftRecord> getVerifyPrizeByGiftId(String giftId) { + return R.fail("根据礼品id获取数据失败:" + throwable.getMessage()); + } + @Override public R signShare(IntegralChangeDto integralChangeDto) { return R.fail("积分变动失败:" + throwable.getMessage()); } - + @Override public R<Integer> getAreaNewMember(List<Long> shopIdList) { return null; } - + @Override public R updateMemberShopName(MgtMemberShopNameDto mgtMemberShopNameDto) { return R.fail("更新商户绑定会员失败:" + throwable.getMessage()); @@ -165,6 +171,16 @@ public R addIntegralRecord(Integer integral, Long userId, String orderId) { return R.fail("手动添加用户积分失败:" + throwable.getMessage()); } + + @Override + public R saveMemberGiftRecord(MemberGiftRecord memberGiftRecord) { + return R.fail("添加奖品数据失败:" + throwable.getMessage()); + } + + @Override + public R editMember(Member member) { + return R.fail("修改会员失败:" + throwable.getMessage()); + } }; } } -- Gitblit v1.7.1