From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 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 9437279..2f1a959 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
@@ -1,13 +1,21 @@
 package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteOrderService;
+import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+import com.ruoyi.system.api.service.RemoteOrderService;
 import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 订单服务
@@ -30,6 +38,36 @@
             public R<AppOrderTotalVo> getAppOrderTotal(Long userId) {
                 return R.fail("获取订单统计失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<MerHomeShopTotalVo> getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
+                return R.fail("获取商户端统计失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<MgtBulletinBoardVo> boardOrderTotal() {
+                return null;
+            }
+
+            @Override
+            public R<List<MgtMapIntTotalVo>> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto) {
+                return R.fail("获取商户端统计失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<BigDecimal> getMemberUnpaidOrder(MerBaseDto merBaseDto) {
+                return R.fail("获取用户未结清金额失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R sendGoodsGift(List<BirthdayGiftSendDto> giftSendDtoList) {
+                return R.fail("发送礼物失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R autoCancelOrder(String orderId) {
+                return R.fail("自动取消订单失败:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1