From 37d2350961bc16543d28e2c9c158dfb2c3734d73 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:05:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 e0b6d42..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,14 +1,13 @@
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;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.PointChangeDto;
-import io.seata.core.exception.TransactionException;
-import io.seata.tm.api.GlobalTransactionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -38,12 +37,6 @@
@Override
public R<TAppUser> getUserById(Long id) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
return R.fail("根据id查询用户失败:"+throwable.getMessage());
}
@@ -57,10 +50,7 @@
return R.fail("修改用户失败:"+throwable.getMessage());
}
- @Override
- public R change(PointChangeDto points) {
- return null;
- }
+
@Override
public R changeDown(PointChangeDto points) {
@@ -96,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