From 82de609c0b76d37d1a5044a631ddc1577374cdfa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 16026ed..a49aad0 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
@@ -5,14 +5,18 @@
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
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.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -31,6 +35,16 @@
@Override
public R<Boolean> saveOrderOne(OrderDTO orderDTO, String source) {
return R.fail("保存订单失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<Order> getOrderOne(OrderDTO orderDTO, String source) {
+ return R.fail("获取订单失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<Order> getOrderOne1(OrderDTO orderDTO, String source) {
+ return R.fail("获取订单失败:" + cause.getMessage());
}
@Override
@@ -54,8 +68,28 @@
}
@Override
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) {
+ 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
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList1(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) {
return R.fail("获取保证金订单列表失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<OrderAuctionBond> getOrderAuctionBondone(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO, String source) {
+ return R.fail("获取保证金订单失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<OrderAuctionBond> getOrderAuctionBondone1(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO, String source) {
+ return R.fail("获取保证金订单失败" + cause.getMessage());
}
@Override
@@ -72,7 +106,7 @@
@Override
public R<?> updateOrderAuctionBondStatus(List<Long> ids,
- BondStatusEnum bondStatusEnum) {
+ BondStatusEnum bondStatusEnum, String source) {
return R.fail("批量更新保证金订单状态失败" + cause.getMessage());
}
@@ -87,8 +121,22 @@
}
@Override
- public R<?> UpdateBond(BondVO BondVO, String source) {
- return R.fail("修改保证金支付状态失败" + cause.getMessage());
+ public R<List<Order>> getOrderByCouponIds(Collection<Long> couponIds, String source) {
+ return R.fail("根据优惠券id列表获取订单列表失败" + cause.getMessage());
+ }
+ @Override
+ public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) {
+ return R.fail("普通拍卖获取保证金失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<?> returnBondByAuctionGoodsId(Long id, String source) {
+ return R.fail("普通拍卖退保证金失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<?> autoCancelOrder(Long id, String source) {
+ return null;
}
};
--
Gitblit v1.7.1