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/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 89 ++++++++++++++------------------------------
1 files changed, 28 insertions(+), 61 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 6dd6f01..f32ebae 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,20 +1,20 @@
package com.ruoyi.auction.controller.forepart;
-import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
-import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
-import com.ruoyi.auction.controller.forepart.vo.*;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
+import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;
+
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -26,6 +26,7 @@
*/
@RestController
@RequestMapping("/forepart/auction-salesroom-goods")
+@Api(value = "拍卖场商品相关接口", tags = "拍卖场商品相关接口", description = "拍卖场商品相关接口")
public class ForepartAuctionSalesroomGoodsController {
@@ -36,10 +37,9 @@
* 拍卖大屏的商品介绍
*
*/
- @RequestMapping("/getAuctionSalesroomGoods")
- @ResponseBody
- @ApiOperation(value = "拍卖大屏的商品介绍")
- public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ @PostMapping("/getAuctionSalesroomGoods")
+ @ApiOperation(value = "拍卖大屏-商品介绍")
+ public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
@@ -47,47 +47,22 @@
* 拍卖师端拍卖场信息
*
*/
- @RequestMapping("/getAuctionSalesroominfo")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场信息")
- public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ @PostMapping("/getAuctionSalesroominfo")
+ @ApiOperation(value = "拍卖师端-拍卖场详情信息")
+ public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
}
- /**
- * 拍卖师端拍卖场立即开始
- *
- */
- @RequestMapping("/auctionSalesroomStart")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场立即开始")
- public R<T> auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
- return R.ok();
- }
-
- /**
- * 拍卖师端拍卖场立即开始
- *
- */
- @RequestMapping("/auctionSalesroomEnd")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场立即结束")
- public R<T> auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
- return R.ok();
- }
/**
* 判断拍卖师端是否还有未拍卖商品
*
*/
- @RequestMapping("/isAuctionSalesroom")
- @ResponseBody
- @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
- public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ @PostMapping("/isAuctionSalesroom")
+ @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
+ public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
}
@@ -96,10 +71,9 @@
* 拍卖师端拍卖场下一个立即开始
*
*/
- @RequestMapping("/auctionSalesroomGoodsStart")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场下一个立即开始")
- public R<T> auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ @PostMapping("/auctionSalesroomGoodsStart")
+ @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
+ public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
}
@@ -110,28 +84,21 @@
* 拍卖师端拍卖场下一个立即结束
*
*/
- @RequestMapping("/auctionSalesroomGoodsEnd")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场下一个立即结束")
- public R<T> auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
- iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
+ @PostMapping("/auctionSalesroomGoodsEnd")
+ @ApiOperation(value = "拍卖师端-拍卖场商品立即结束")
+ public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomGoodsEnd(auctionSalesroomGoodsDTO);
return R.ok();
}
- @RequestMapping("/getAuctionSalesroomGoodsInfo")
- @ResponseBody
- @ApiOperation(value = "用户端拍卖场商品详情")
+ @PostMapping("/getAuctionSalesroomGoodsInfo")
+ @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