From f2905c22f4d9929bc0a7598568b923de4b4b12be Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 20:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 1b3ad73..4c2bf1a 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,Long shopId) {
+ 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(Integer shopId,Long userId) {
+ return R.fail("通过门店和用户id查询订单失败");
+ }
};
}
--
Gitblit v1.7.1