From 472fc1b5980db8cd69c77a5c1bcb8aded3d3b3a6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 十一月 2024 19:05:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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 a8ab6b2..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());
             }
 
@@ -93,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