From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/OrderClientFallbackFactory.java |    8 +++++++-
 1 files changed, 7 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 5f643be..315e863 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
@@ -40,6 +40,11 @@
             }
 
             @Override
+            public R<List<Order>> getRedeemedOrdersByShop(Integer shopId) {
+                return R.fail("获取已核销的订单失败:" + cause.getMessage());
+            }
+
+            @Override
             public R<Order> getOrderById(Long id) {
                 return R.fail("根据id获取订单详情失败:" + cause.getMessage());
             }
@@ -48,7 +53,8 @@
             public R editOrder(Order order) {
                 return R.fail("编辑订单详情失败:" + cause.getMessage());
             }
-    
+
+
             @Override
             public R<Long> getOrderCountByAppUserId(Long appUserId) {
                 return R.fail("获取用户订单数量失败:" + cause.getMessage());

--
Gitblit v1.7.1