Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java

@@ -1,9 +1,9 @@
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.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
@@ -15,10 +15,7 @@
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;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -47,24 +44,20 @@
     * 拍卖大屏滚动
     *
     */
    @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 = "用户端-拍卖出价")
    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));