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/feignClient/AuctionClient.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
index 92b5519..c605b46 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
@@ -8,9 +8,11 @@
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.factory.AuctionFallbackFactory;
+import java.util.Collection;
+import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -18,16 +20,14 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
-import java.util.List;
-
@FeignClient(contextId = "auctionClient", value = ServiceNameConstants.RUOYI_AUCTION, fallbackFactory = AuctionFallbackFactory.class)
public interface AuctionClient {
- @PostMapping("/forepart/auction-salesroom/getAuctionSalesroomOne")
- R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId,
+ @PostMapping("/auction-salesroom/getAuctionSalesroomOne")
+ R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/forepart/auction-goods/getAuctionGoodsOne")
- R<AuctionGoods> getauctionGoodsOne(@RequestBody Long auctionGoodsId,
+ @PostMapping("/auction-goods/getAuctionGoodsOne")
+ R<AuctionGoods> getauctionGoodsOne(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PutMapping("/auction-goods/end/{id}")
@@ -44,7 +44,11 @@
@PostMapping("/order-auction-bond/UpdateBond")
R<?> UpdateBond(@RequestBody BondDTO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order-auction-bond/getBond")
+ R<OrderAuctionBond> getBond(@RequestBody BondDTO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/order-auction-bond/getAuctionGoodsOrderAuctionBondList")
- R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/auction-salesroom/list-by-ids")
+ R<List<AuctionSalesroom>> getAuctionSalesroomByIds(
+ @RequestBody Collection<Long> auctionSalesroomGoodsIdSet,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1