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 |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 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 5f84714..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
@@ -1,11 +1,8 @@
 package com.ruoyi.auction.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
-import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
-import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
-import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
-import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.zxing.WriterException;
 import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
 import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
 import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsQuery;
@@ -21,11 +18,18 @@
 import com.ruoyi.system.api.domain.AppMiniLoginVO;
 import com.ruoyi.system.api.domain.AuctionSalesroom;
 import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
 import com.ruoyi.system.api.domain.dto.BidDTO;
+import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
 import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
 import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
+import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
+import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
 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;
 
@@ -42,18 +46,20 @@
      * 拍卖大屏获取拍卖信息
      *
      */
-    PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
+    List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO);
 
     /**
      * 暖场视频or封面海报
      *
      */
-     ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
+     ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomDTO ationSalesroomGoodsDTO);
 
 
      AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
 
     AppMiniLoginVO actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
+
+    AppMiniLoginVO isMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
 
 
     PageDTO<MemberAuctionSalesroomVO> getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO);
@@ -85,7 +91,7 @@
     void SaveBid(@RequestBody BidDTO BidVO);
 
 
-    void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto);
+    void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto) throws IOException, WriterException;
 
     PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO);
 
@@ -150,21 +156,21 @@
      *
      * @param idList 备选商品id集合
      */
-    void addBackupGoods(List<Long> idList);
+    void addBackupGoods(String idStr);
 
     /**
      * 结束当前拍卖商品
      *
      * @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;
 
     /**
      * 播放视频
@@ -173,5 +179,21 @@
      */
     void play(MgtScreenVideoDTO dto);
 
+    /**
+     * 结束播放
+     *
+     * @param auctionSalesroomId 拍卖场id
+     */
     void stopPlay(Long auctionSalesroomId);
+
+    /**
+     * 开始当前拍卖场
+     *
+     * @param auctionSalesroomId 拍卖场id
+     */
+    void startCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
+
+    void stopCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
+
+    List<AuctionSalesroom> getAuctionSalesroomByIds(Collection<Long> auctionSalesroomGoodsIdSet);
 }

--
Gitblit v1.7.1