From fd35f223b7f40ee9ee4a9307384b54a96d7956a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java |   13 ++++++++-----
 1 files changed, 8 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 5c3fc3f..d00fb80 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
@@ -36,7 +36,7 @@
     
             @Override
             public R<TAppUser> getUserById(Long id) {
-                throw new RuntimeException("根据id查询用户失败:"+throwable.getMessage());
+                return R.fail("根据id查询用户失败:"+throwable.getMessage());
             }
 
             @Override
@@ -49,10 +49,7 @@
                 return R.fail("修改用户失败:"+throwable.getMessage());
             }
 
-            @Override
-            public R change(PointChangeDto points) {
-                return null;
-            }
+
 
             @Override
             public R changeDown(PointChangeDto points) {
@@ -88,6 +85,12 @@
             public R<TAppUserAddress> getAddressById(Long id) {
                 return R.fail("通过地址id `查询用户地址失败:"+throwable.getMessage());
             }
+    
+    
+            @Override
+            public R<String> getWXToken() {
+                return R.fail("获取微信token失败:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1