Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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);
}