From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 24 +++++++++++++++++++-----
1 files changed, 19 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 71dc82f..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
@@ -1,5 +1,6 @@
package com.ruoyi.account.api.factory;
+import com.ruoyi.account.api.dto.GiveVipDto;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
@@ -35,7 +36,7 @@
@Override
public R<TAppUser> getUserById(Long id) {
- throw new RuntimeException("根据id查询用户失败:"+throwable.getMessage());
+ return R.fail("根据id查询用户失败:"+throwable.getMessage());
}
@Override
@@ -48,10 +49,7 @@
return R.fail("修改用户失败:"+throwable.getMessage());
}
- @Override
- public R change(PointChangeDto points) {
- return null;
- }
+
@Override
public R changeDown(PointChangeDto points) {
@@ -64,8 +62,18 @@
}
@Override
+ public R<List<TAppUser>> selectByPhoneLike(String phone) {
+ return R.fail("通过手机号模糊查询用户失败:"+throwable.getMessage());
+ }
+
+ @Override
public R refundPoints(String param) {
return R.fail("后台兑换订单退款回退用户积分失败:"+throwable.getMessage());
+ }
+
+ @Override
+ public R giveVip(GiveVipDto giveVipDto) {
+ return null;
}
@Override
@@ -77,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