From 7ce97a95ba44b18aa525b2c0540e5162c59d1474 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:51:50 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
index a58727d..8b42139 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
@@ -2,12 +2,20 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionBidRecordVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
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.system.api.domain.dto.BidDTO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
+
+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;
@@ -22,10 +30,17 @@
*/
@RestController
@RequestMapping("/forepart/auction-bid-record")
+@Api(value = "用户端-出价相关接口", tags = "用户端-出价相关接口", description = "用户端-出价相关接口")
public class ForepartAuctionBidRecordController {
@Resource
private IAuctionBidRecordService iAuctionBidRecordService;
+
+ @Resource
+ private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @Resource
+ private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
/**
@@ -34,10 +49,25 @@
*/
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
- @ApiOperation(value = "拍卖大屏滚动出价")
- public R<List<AuctionBidRecord>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ @ApiOperation(value = "拍卖大屏-滚动出价")
+ public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO));
}
+ @RequestMapping("/SaveBid")
+ @ResponseBody
+ @ApiOperation(value = "用户端-拍卖出价")
+ public R SaveBid(@RequestBody BidDTO BidVO) {
+ iAuctionSalesroomService.SaveBid(BidVO);
+ return R.ok();
+ }
+
+ @RequestMapping("/getAuctionBidRecord")
+ @ResponseBody
+ @ApiOperation(value = "用户端-商品详情里面的出价记录")
+ public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
+ }
+
}
--
Gitblit v1.7.1