Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java

@@ -4,6 +4,7 @@
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;
@@ -11,7 +12,7 @@

/**
 * 商户服务
 * 
 *
 * @author jqs
 */
@Component
@@ -29,6 +30,11 @@
            public R<Shop> getShop(Long shopId) {
                return R.fail("获取商户失败:" + throwable.getMessage());
            }

            @Override
            public R<ShopRelUserVo> getShopByUserId(Long userId) {
                return R.fail("获取商户失败:" + throwable.getMessage());
            }
        };
    }
}