From 466b7ae4a0b12089d716030b024c8dcd0b29b02f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:03:06 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 b811b76..71dc82f 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,8 +1,11 @@
package com.ruoyi.account.api.factory;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.PointChangeDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -32,7 +35,12 @@
@Override
public R<TAppUser> getUserById(Long id) {
- return R.fail("根据id查询用户失败:"+throwable.getMessage());
+ throw new RuntimeException("根据id查询用户失败:"+throwable.getMessage());
+ }
+
+ @Override
+ public R<TAppCoupon> couponGetById(Long id) {
+ return R.fail("查询优惠券失败:"+throwable.getMessage());
}
@Override
@@ -41,14 +49,34 @@
}
@Override
+ public R change(PointChangeDto points) {
+ return null;
+ }
+
+ @Override
+ public R changeDown(PointChangeDto points) {
+ return null;
+ }
+
+ @Override
public R<TAppUser> selectByPhone(String phone) {
- return R.fail("通过手机号查询用户失败:"+throwable.getMessage());
+ return R.fail("积分变化失败:"+throwable.getMessage());
+ }
+
+ @Override
+ public R refundPoints(String param) {
+ return R.fail("后台兑换订单退款回退用户积分失败:"+throwable.getMessage());
}
@Override
public R<List<TAppUser>> getUserByIds(List<Long> appUserIds) {
return R.fail("根据用户id查询用户信息失败:"+throwable.getMessage());
}
+
+ @Override
+ public R<TAppUserAddress> getAddressById(Long id) {
+ return R.fail("通过地址id `查询用户地址失败:"+throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1