From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 05 二月 2025 10:42:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java index ab00b84..b4cd200 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java @@ -1,5 +1,7 @@ package com.ruoyi.account.api.factory; +import com.ruoyi.account.api.dto.GiveVipDto; +import com.ruoyi.account.api.dto.SendMessageDTO; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.model.TAppUser; @@ -35,7 +37,7 @@ @Override public R<TAppUser> getUserById(Long id) { - throw new RuntimeException("根据id查询用户失败:"+throwable.getMessage()); + return R.fail("根据id查询用户失败:"+throwable.getMessage()); } @Override @@ -48,10 +50,7 @@ return R.fail("修改用户失败:"+throwable.getMessage()); } - @Override - public R change(PointChangeDto points) { - return null; - } + @Override public R changeDown(PointChangeDto points) { @@ -74,6 +73,11 @@ } @Override + public R giveVip(GiveVipDto giveVipDto) { + return null; + } + + @Override public R<List<TAppUser>> getUserByIds(List<Long> appUserIds) { return R.fail("根据用户id查询用户信息失败:"+throwable.getMessage()); } @@ -82,6 +86,23 @@ public R<TAppUserAddress> getAddressById(Long id) { return R.fail("通过地址id `查询用户地址失败:"+throwable.getMessage()); } + + + @Override + public R<String> getWXToken() { + return R.fail("获取微信token失败:" + throwable.getMessage()); + } + + @Override + public R<Boolean> sensitiveWordDetection(String content, String openid) { + return R.fail("敏感词校验失败:" + throwable.getMessage()); + } + + @Override + public R<String> sendMessage(SendMessageDTO sendMessageDTO) { + return R.fail("短信发送失败:" + throwable.getMessage()); + } + }; } } -- Gitblit v1.7.1