From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 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 c2996e4..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
@@ -2,7 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.*;
-import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo;
+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;
@@ -12,7 +12,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;
/**
@@ -38,6 +40,16 @@
@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());
}
@@ -69,11 +81,6 @@
@Override
public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(MgtBaseBathDto mgtBaseBathDto) {
return R.fail("获取商户列表失败:" + throwable.getMessage());
- }
-
- @Override
- public R<MgtBulletinBoardVo> boardShopTotal() {
- return null;
}
@Override
@@ -125,6 +132,36 @@
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();
+ }
};
}
}
--
Gitblit v1.7.1