From 05fe558f722590aa706c2296c8a9a619d12b42be Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 14:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java |   42 +++++++++++++-----------------------------
 1 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
index a01faf1..8f5830b 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -1,23 +1,12 @@
 package com.ruoyi.auction.controller.forepart;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.auction.controller.forepart.DTO.AuctionSalesroomGoodsDTO;
-import com.ruoyi.auction.controller.forepart.DTO.orderDTO;
-import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
-import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO;
-import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
+import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
 import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
-import com.ruoyi.auction.service.IAuctionBidRecordService;
 import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
-import com.ruoyi.auction.service.IAuctionSalesroomService;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
-import com.ruoyi.common.core.enums.BidStatusEnum;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,11 +15,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -56,9 +40,9 @@
     @RequestMapping("/getAuctionSalesroomGoods")
     @ResponseBody
     @ApiOperation(value = "拍卖大屏的商品介绍")
-    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(Integer SalesroomId) {
+    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
 
-        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(SalesroomId));
+        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
     }
 
 
@@ -71,8 +55,8 @@
     @RequestMapping("/getAuctionSalesroominfo")
     @ResponseBody
     @ApiOperation(value = "拍卖师端拍卖场信息")
-    public R<AuctionSalesroomVO> getAuctionSalesroominfo(Integer SalesroomId) {
-        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(SalesroomId));
+    public R<AuctionSalesroomVO> getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
     }
 
 
@@ -87,8 +71,8 @@
     @RequestMapping("/auctionSalesroomStart")
     @ResponseBody
     @ApiOperation(value = "拍卖师端拍卖场立即开始")
-    public R<T> auctionSalesroomStart(Integer SalesroomId) {
-    iAuctionSalesroomGoodsService.auctionSalesroomStart(SalesroomId);
+    public R<T> auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
         return R.ok();
     }
 
@@ -100,8 +84,8 @@
     @RequestMapping("/auctionSalesroomEnd")
     @ResponseBody
     @ApiOperation(value = "拍卖师端拍卖场立即结束")
-    public R<T> auctionSalesroomEnd(Integer SalesroomId) {
-        iAuctionSalesroomGoodsService.auctionSalesroomEnd(SalesroomId);
+    public R<T> auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+        iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
         return R.ok();
     }
 
@@ -113,9 +97,9 @@
     @RequestMapping("/isAuctionSalesroom")
     @ResponseBody
     @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
-    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(Integer SalesroomId) {
+    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
 
-        return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(SalesroomId));
+        return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
     }
 
 

--
Gitblit v1.7.1