From d20a4aade6f9ed5111b496ac9abdff9f05f81535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 22:32:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
index 9a944f8..f2659f8 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
@@ -54,7 +54,7 @@
             }
 
             @Override
-            public R<List<Order>> byUserId(Long appUserId) {
+            public R<List<Order>> byUserId(Long appUserId,Integer shopId) {
                 return R.fail();
             }
 
@@ -62,6 +62,10 @@
             public R<List<Order>> byShopId(Integer shopId) {
                 return R.fail();
             }
+            @Override
+            public R<List<Order>> byShopIdAndUserId(Long userId,Integer shopId) {
+                return R.fail("通过门店和用户id查询订单失败");
+            }
         };
 
     }

--
Gitblit v1.7.1