From 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 09:13:12 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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 88cca43..8543153 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
@@ -2,8 +2,8 @@
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.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
+import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
@@ -11,6 +11,7 @@
import java.util.List;
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@@ -38,13 +39,9 @@
@RequestMapping("/getAuctionSalesroomGoods")
@ResponseBody
@ApiOperation(value = "拍卖大屏的商品介绍")
- public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
-
+ public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
-
-
-
/**
* 拍卖师端拍卖场信息
@@ -53,14 +50,9 @@
@RequestMapping("/getAuctionSalesroominfo")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场信息")
- public R<AuctionSalesroomVO> getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
}
-
-
-
-
-
/**
* 拍卖师端拍卖场立即开始
@@ -69,7 +61,7 @@
@RequestMapping("/auctionSalesroomStart")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即开始")
- public R<T> auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -82,7 +74,7 @@
@RequestMapping("/auctionSalesroomEnd")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即结束")
- public R<T> auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -95,8 +87,7 @@
@RequestMapping("/isAuctionSalesroom")
@ResponseBody
@ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
- public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
-
+ public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
}
@@ -108,7 +99,7 @@
@RequestMapping("/auctionSalesroomGoodsStart")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场下一个立即开始")
- public R<T> auctionSalesroomGoodsStart(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
}
@@ -121,9 +112,26 @@
*/
@RequestMapping("/auctionSalesroomGoodsEnd")
@ResponseBody
- @ApiOperation(value = "拍卖师端拍卖商品立即结束")
- public R<T> auctionSalesroomGoodsEnd(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ @ApiOperation(value = "拍卖师端拍卖场下一个立即结束")
+ public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
}
+
+
+ @RequestMapping("/getAuctionSalesroomGoodsInfo")
+ @ResponseBody
+ @ApiOperation(value = "用户端拍卖场商品详情")
+ public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
+ }
+
+ @RequestMapping("/getAuctionBidRecord")
+ @ResponseBody
+ @ApiOperation(value = "用户端商品详情里面的出价记录")
+ public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
+ }
+
+
}
--
Gitblit v1.7.1