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,26 +1,21 @@
package com.ruoyi.auction.controller.forepart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
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;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.system.api.domain.dto.BidDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;

import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -32,22 +27,40 @@
 */
@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;


    /**
     * 拍卖大屏滚动
     *
     */
    @RequestMapping("/getAuctionBidRecordList")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏滚动出价")
    public R<List<AuctionBidRecord>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
    @PostMapping("/getAuctionBidRecordList")
    @ApiOperation(value = "拍卖大屏-滚动出价")
    public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
        return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO));

    }

    @PostMapping("/SaveBid")
    @ApiOperation(value = "用户端-拍卖出价")
    public R SaveBid(@RequestBody BidDTO BidVO) {
        iAuctionSalesroomService.SaveBid(BidVO);
        return R.ok();
    }
    @PostMapping("/getAuctionBidRecord")
    @ApiOperation(value = "用户端-商品详情里面的出价记录")
    public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
        return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
    }

}