From b1c3cb31d1e8c250dd6817bd71ddfb3c785cb235 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:54:01 +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 | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 9 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 b012c43..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,10 +1,10 @@
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.MgtBaseBathDto;
-import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
-import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
-import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto;
+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;
import com.ruoyi.system.api.model.QwUserDetailDto;
@@ -14,7 +14,9 @@
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.Collections;
import java.util.List;
/**
@@ -36,6 +38,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
@@ -69,11 +86,6 @@
}
@Override
- public R<MgtBulletinBoardVo> boardShopTotal() {
- return null;
- }
-
- @Override
public R<List<Long>> listShopIdByPlTotal(MgtBasePlatformDto mgtBasePlatformDto) {
return R.fail("获取商户列表失败:" + throwable.getMessage());
}
@@ -102,6 +114,71 @@
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());
+ }
+
+ @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();
+ }
+
+ @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