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/RemoteOrderGoodsFallbackFactory.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 5818bc6..77de313 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
@@ -44,11 +44,6 @@
}
@Override
- public R<Void> calculationCommission(Set<String> orderIds) {
- return R.fail("计算佣金失败");
- }
-
- @Override
public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId) {
return R.fail("获取商品价格失败");
}
@@ -57,6 +52,25 @@
public R<Order> getLastOrder(Long appUserId) {
return R.fail("获取订单失败");
}
+
+ @Override
+ public R<List<Order>> byUserId(Long appUserId,Integer shopId) {
+ return R.fail();
+ }
+
+ @Override
+ public R<List<Order>> byShopId(Integer shopId) {
+ return R.fail();
+ }
+ @Override
+ public R<List<Order>> byShopIdAndUserId(Long userId,Integer shopId) {
+ return R.fail("通过门店和用户id查询订单失败");
+ }
+
+ @Override
+ public R<List<OrderGood>> getUnDistributedOrder(List<Long> appUserIds) {
+ return R.fail("获取未分配订单失败");
+ }
};
}
--
Gitblit v1.7.1