From c642ca1d5aad271b22155fce6bd553533343501c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 七月 2025 09:10:10 +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/RemoteOrderFallbackFactory.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
index 7b07b35..9b0595b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
+import com.ruoyi.system.api.domain.dto.BoardMemberTotalDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.*;
@@ -39,11 +40,6 @@
@Override
public R<MerHomeShopTotalVo> getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
return R.fail("获取商户端统计失败:" + throwable.getMessage());
- }
-
- @Override
- public R<MgtBulletinBoardVo> boardOrderTotal() {
- return null;
}
@Override
@@ -90,6 +86,22 @@
public R<List<String>> getActivityOrderGoods(String activityId) {
return R.fail("获取活动订单商品id失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<StaticsShopMgtGoodsVO> getGoodsSellStatic(List<String> orderIdList) {
+
+ return R.fail("获取商品售卖统计失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<MgtBulletinBoardVo> boardOrderTotal(BoardMemberTotalDto boardMemberTotalDto) {
+ return R.fail(throwable.getMessage());
+ }
+
+ @Override
+ public R<List<Integer>> countShopServicePerson(Long shopId) {
+ return R.fail("获取今日到店用户失败:" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1