From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 20:56:27 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 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 8b42139..89e94ed 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 @@ -1,23 +1,26 @@ 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.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.AuctionSalesroomDTO; +import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO; import com.ruoyi.system.api.domain.dto.BidDTO; +import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO; +import com.ruoyi.system.api.domain.vo.PopUpVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; - +import lombok.Synchronized; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; 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; /** @@ -47,27 +50,37 @@ * 拍卖大屏滚动 * */ - @RequestMapping("/getAuctionBidRecordList") - @ResponseBody + @PostMapping("/getAuctionBidRecordList") @ApiOperation(value = "拍卖大屏-滚动出价") - public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) { + public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) { return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO)); } - @RequestMapping("/SaveBid") - @ResponseBody + @PostMapping("/SaveBid") @ApiOperation(value = "用户端-拍卖出价") + @Synchronized public R SaveBid(@RequestBody BidDTO BidVO) { iAuctionSalesroomService.SaveBid(BidVO); return R.ok(); } - - @RequestMapping("/getAuctionBidRecord") - @ResponseBody + @PostMapping("/getAuctionBidRecord") @ApiOperation(value = "用户端-商品详情里面的出价记录") public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) { return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO)); } + @GetMapping("/setPopup/{auctionBidRecordId}") + @ApiOperation("【2024.12.31】标记已弹出弹窗") + public R<?> setPopup(@PathVariable("auctionBidRecordId") Long auctionBidRecordId) { + iAuctionBidRecordService.setPopup(auctionBidRecordId); + return R.ok(); + } + + @ApiOperation("【2024.12.31】查询用户弹窗") + @GetMapping("/popupList") + public R<List<PopUpVO>> popupList() { + List<PopUpVO> popupList = iAuctionBidRecordService.popupList(); + return R.ok(popupList); + } } -- Gitblit v1.7.1