From 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 11:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index db3c93c..b95b0f8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -11,6 +11,7 @@
import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.util.List;
@@ -51,6 +52,16 @@
@Override
public R<List<Order>> getOrderByGroupPurchaseId(Long id, String source) {
return R.fail("根据团购商品id获取订单列表失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<Order> getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
+ return R.fail("根据团购商品用户获取订单:" + cause.getMessage());
+ }
+
+ @Override
+ public R<List<OrderVO>> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
+ return R.fail("根据团购商品用户d获取订单列表失败:" + cause.getMessage());
}
@Override
@@ -96,15 +107,7 @@
return R.fail("生成保证金失败" + cause.getMessage());
}
- @Override
- public R<?> UpdateBond(BondDTO BondVO, String source) {
- return R.fail("修改保证金支付状态失败" + cause.getMessage());
- }
- @Override
- public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) {
- return R.fail("普通拍卖获取保证金失败" + cause.getMessage());
- }
};
}
--
Gitblit v1.7.1