From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +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 |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 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 3696a02..61ce884 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,13 +1,14 @@
 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.vo.ShopProportionVo;
+import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.*;
 import com.ruoyi.system.api.model.QwH5LoginVo;
 import com.ruoyi.system.api.model.QwUserDetailDto;
 import com.ruoyi.system.api.service.RemoteShopService;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -162,6 +163,27 @@
             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());
+            }
+            
+            
+            @Override
+	        public R<List<Integer>> getMemberIngTotal(Long shopId) {
+		        return R.fail("获取有跟进任务的用户id失败:"+throwable.getMessage());
+	        }
         };
     }
 }

--
Gitblit v1.7.1