From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 23 六月 2025 11:11:02 +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 | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 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 8c83b8a..0d487e8 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,9 @@ package com.ruoyi.system.api.factory; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.*; +import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing; import com.ruoyi.system.api.domain.vo.ShopProportionVo; import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.model.QwH5LoginVo; @@ -14,6 +16,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Collections; import java.util.List; /** @@ -156,6 +159,26 @@ public List<Shop> getShopBySysUserIds(BoardMemberTotalDto boardMemberTotalDto) { return null; } + + @Override + public List<Shop> getFranchiseeIdsBYDealerId(Long shopId) { + return Collections.emptyList(); + } + + @Override + public Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto) { + return null; + } + + @Override + public List<Shop> getShopListByShopName(String content) { + return null; + } + + @Override + public R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing) { + return R.fail("一键同步商户信息失败:"+throwable.getMessage()); + } }; } } -- Gitblit v1.7.1