Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

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

@@ -2,11 +2,12 @@


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
@@ -26,6 +27,7 @@
 */
@RestController
@RequestMapping("/forepart/auction-salesroom-goods")
@Api(value = "拍卖场商品相关接口", tags = "拍卖场商品相关接口", description = "拍卖场商品相关接口")
public class ForepartAuctionSalesroomGoodsController {


@@ -38,14 +40,10 @@
     */
    @RequestMapping("/getAuctionSalesroomGoods")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏的商品介绍")
    @ApiOperation(value = "拍卖大屏-商品介绍")
    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {

        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
    }




    /**
     * 拍卖师端拍卖场信息
@@ -53,40 +51,12 @@
     */
    @RequestMapping("/getAuctionSalesroominfo")
    @ResponseBody
    @ApiOperation(value = "拍卖师端拍卖场信息")
    @ApiOperation(value = "拍卖师端-拍卖场详情信息")
    public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO 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();
    }


    /**
@@ -95,9 +65,8 @@
     */
    @RequestMapping("/isAuctionSalesroom")
    @ResponseBody
    @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
    @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {

        return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
    }

@@ -108,8 +77,8 @@
     */
    @RequestMapping("/auctionSalesroomGoodsStart")
    @ResponseBody
    @ApiOperation(value = "拍卖师端拍卖场下一个立即开始")
    public R<T> auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
    @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
    public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
        iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
        return R.ok();
    }
@@ -122,11 +91,21 @@
     */
    @RequestMapping("/auctionSalesroomGoodsEnd")
    @ResponseBody
    @ApiOperation(value = "拍卖师端拍卖商品立即结束")
    public R<T> auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
    @ApiOperation(value = "拍卖师端-拍卖场商品立即结束")
    public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
        iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
        return R.ok();
    }


    @RequestMapping("/getAuctionSalesroomGoodsInfo")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖场商品详情")
    public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
        return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
    }




}