From caf38fb12050d677052087f3391adcc64a6959c9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 18:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java
index c28dc25..2a96c13 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.model.Order;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 import java.util.List;
@@ -29,7 +30,17 @@
 
             @Override
             public R<Set<Long>> getAppUserByShoppingShop(Integer shopId) {
-                return R.fail("获取所有在指定门店消费的用户id失败:" + cause);
+                return R.fail("获取所有在指定门店消费的用户id失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<Order> getOrderById(Long id) {
+                return R.fail("根据id获取订单详情失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R editOrder(Order order) {
+                return R.fail("编辑订单详情失败:" + cause.getMessage());
             }
         };
     }

--
Gitblit v1.7.1