From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
index fe58faa..38b7f0a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
@@ -6,12 +6,12 @@
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.BondDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.feignClient.AuctionClient;
-import org.springframework.cloud.openfeign.FallbackFactory;
-
+import java.util.Collection;
import java.util.List;
+import org.springframework.cloud.openfeign.FallbackFactory;
/**
* @author mitao
@@ -24,12 +24,12 @@
return new AuctionClient() {
@Override
- public R<AuctionSalesroom> getauctionSalesroomOne(Long auctionSalesroomId, String source) {
+ public R<AuctionSalesroom> getauctionSalesroomOne(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO, String source) {
return R.fail("获取普通拍卖场失败" + cause.getMessage());
}
@Override
- public R<AuctionGoods> getauctionGoodsOne(Long auctionGoodsId, String source) {
+ public R<AuctionGoods> getauctionGoodsOne(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO, String source) {
return R.fail("获取普通拍卖商品失败" + cause.getMessage());
}
@@ -53,8 +53,14 @@
}
@Override
- public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) {
- return R.fail("普通拍卖获取保证金失败" + cause.getMessage());
+ public R<OrderAuctionBond> getBond(BondDTO BondVO, String source) {
+ return R.fail("获取保证金支付状态失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<List<AuctionSalesroom>> getAuctionSalesroomByIds(
+ Collection<Long> auctionSalesroomGoodsIdSet, String source) {
+ return R.fail("获取拍卖场列表失败" + cause.getMessage());
}
};
}
--
Gitblit v1.7.1