From 9658e5ca43e617c68c54d7dd7797f873e55311c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 21:26:39 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
index 769f77f..b8be06a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
@@ -1,7 +1,10 @@
 package com.ruoyi.system.api.factory;
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteMemberService;
 import com.ruoyi.system.api.RemoteShopService;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -9,7 +12,7 @@
 
 /**
  * 商户服务
- * 
+ *
  * @author jqs
  */
 @Component
@@ -23,7 +26,15 @@
         log.error("商户服务调用失败:{}", throwable.getMessage());
         return new RemoteShopService()
         {
+            @Override
+            public R<Shop> getShop(Long shopId) {
+                return R.fail("获取商户失败:" + throwable.getMessage());
+            }
 
+            @Override
+            public R<ShopRelUserVo> getShopByUserId(Long userId) {
+                return R.fail("获取商户失败:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1