From 49f2eff2cf52e0f1719dfad43cafff11b378252c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 18:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
index 926794a..1c2144f 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopClientFallbackFactory.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.feignClient.ShopClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -18,7 +19,12 @@
public R<Shop> getShopById(Integer id) {
return R.fail("根据id获取门店信息失败：" + cause.getMessage());
}
-
+
+ @Override
+ public R<List<Shop>> getShopByUserId(Long id) {
+ return R.fail("根据用户id集合获取门店数据失败");
+ }
+
@Override
public R<Shop> getShopByPhone(String phone) {
return R.fail("根据店铺管理员电话获取门店数据失败：" + cause.getMessage());
@@ -33,6 +39,11 @@
public R<Set<Integer>> getShopIdByName(String shopName) {
return R.fail("根据门店名称获取门店id失败：" + cause.getMessage());
}
+
+ @Override
+ public R<List<ShopBalanceStatement>> getShopBalanceStatementList(ShopBalanceStatement shopBalanceStatement) {
+ return R.fail();
+ }
};
}
}
--
Gitblit v1.7.1