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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 7b18151..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,6 +1,7 @@
package com.ruoyi.auction.service;
import com.baomidou.mybatisplus.extension.service.IService;
+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;
@@ -28,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;
@@ -44,7 +46,7 @@
* 拍卖大屏获取拍卖信息
*
*/
- PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO);
+ List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO);
/**
* 暖场视频or封面海报
@@ -56,6 +58,8 @@
AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
AppMiniLoginVO actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
+
+ AppMiniLoginVO isMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
PageDTO<MemberAuctionSalesroomVO> getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO);
@@ -152,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;
/**
* 播放视频
@@ -187,7 +191,9 @@
*
* @param auctionSalesroomId 拍卖场id
*/
- void startCurrentAuctionSalesroom(Long auctionSalesroomId);
+ void startCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
- void stopCurrentAuctionSalesroom(Long auctionSalesroomId);
+ void stopCurrentAuctionSalesroom(Long auctionSalesroomId) throws JsonProcessingException;
+
+ List<AuctionSalesroom> getAuctionSalesroomByIds(Collection<Long> auctionSalesroomGoodsIdSet);
}
--
Gitblit v1.7.1