From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 12 ++++--------
1 files changed, 4 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 7ca08aa..d9d9f08 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,15 +5,11 @@
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.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;
@@ -108,14 +104,14 @@
}
@Override
- public R<?> UpdateBond(BondDTO 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());
}
+
};
}
--
Gitblit v1.7.1