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-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
index a124b2f..84a83ab 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -29,6 +29,7 @@
 import com.ruoyi.system.api.domain.vo.PayInfoVO;
 import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -162,14 +163,14 @@
      *
      * @param id 拍卖场商品id
      */
-    void stopCurrentGoods(Long id);
+    void stopCurrentGoods(Long id) throws JsonProcessingException;
 
     /**
      * 开始下一拍卖商品
      *
      * @param id 拍卖场商品id
      */
-    void startNextGoods(Long id);
+    void startNextGoods(Long id) throws JsonProcessingException;
 
     /**
      * 播放视频
@@ -193,4 +194,6 @@
     void startCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
 
     void stopCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
+
+    List<AuctionSalesroom> getAuctionSalesroomByIds(Collection<Long> auctionSalesroomGoodsIdSet);
 }

--
Gitblit v1.7.1