From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java |   90 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 6 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 72a50b6..080c521 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,19 +1,18 @@
 package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
-import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
+import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.vo.ShopProportionVo;
+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 com.ruoyi.system.api.domain.vo.ShopRelUserVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -36,6 +35,21 @@
             @Override
             public R<Shop> getShop(Long shopId) {
                 return R.fail("获取商户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> getShopSubMchId(Long shopId) {
+                return R.fail("获取微信商户号失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<Long>> getShopIdsByUserIds(List<Long> userIds) {
+                return R.fail("通过用户ids获取店铺ids失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<ShopAuthenticationHftxVo> getShopHFTXSubMchId(@RequestBody Long shopId){
+                return R.fail("获取微信商户号失败:" + throwable.getMessage());
             }
 
             @Override
@@ -64,7 +78,7 @@
             }
 
             @Override
-            public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(String shopIds) {
+            public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(MgtBaseBathDto mgtBaseBathDto) {
                 return R.fail("获取商户列表失败:" + throwable.getMessage());
             }
 
@@ -73,6 +87,70 @@
                 return null;
             }
 
+            @Override
+            public R<List<Long>> listShopIdByPlTotal(MgtBasePlatformDto mgtBasePlatformDto) {
+                return R.fail("获取商户列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R changeShopTotal(ShopTotalChangeDto shopTotalChangeDto) {
+                return R.fail("更新商户统计失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<MemberTaskSimpleVo> getLastMemberTask(Long userId) {
+                return R.fail("获取最近会员任务失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<Long>> listShopIdByShopId(Long shopId) {
+                return R.fail("获取商户列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> getUnReplaySuggestVo() {
+                return null;
+            }
+
+            @Override
+            public R<Integer> getShopMarketingStatus(Long shopId) {
+                return null;
+            }
+
+            @Override
+            public R<ShopRelUserVo> getShopByBelongUserId(Long userId) {
+                return R.fail("获取商户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R editMgtShopStaff(MgtShopStaffEditDto mgtShopStaffEditDto) {
+                return R.fail("修改员工失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<ShopProportionVo> getShopProportion(Long shopId) {
+                return R.fail("获取商户分成信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<Long>> listShopIdByCityCode(List<String> cityCodes) {
+                return R.fail("获取商户列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<MgtUserTaskMsgVo>> getTaskMsgList() {
+                return R.fail("获取任务通知列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<Shop>> listShopByCityCode(List<String> cityCodes) {
+                return R.fail("获取商户列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<Shop>> listShopByIds(List<String> ids) {
+                return R.fail("获取商户列表失败:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1