From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 18 六月 2025 10:31:30 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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 080c521..3696a02 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 @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Collections; import java.util.List; /** @@ -83,11 +84,6 @@ } @Override - public R<MgtBulletinBoardVo> boardShopTotal() { - return null; - } - - @Override public R<List<Long>> listShopIdByPlTotal(MgtBasePlatformDto mgtBasePlatformDto) { return R.fail("获取商户列表失败:" + throwable.getMessage()); } @@ -151,6 +147,21 @@ public R<List<Shop>> listShopByIds(List<String> ids) { return R.fail("获取商户列表失败:" + throwable.getMessage()); } + + @Override + public R<MgtBulletinBoardVo> boardShopTotal(BoardMemberTotalDto boardMemberTotalDto) { + return R.fail(throwable.getMessage()); + } + + @Override + public List<Shop> getShopBySysUserIds(BoardMemberTotalDto boardMemberTotalDto) { + return null; + } + + @Override + public List<Shop> getFranchiseeIdsBYDealerId(Long shopId) { + return Collections.emptyList(); + } }; } } -- Gitblit v1.7.1