Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-10 0858bae1cdbfe973ca53985e151cae48b81c8b0b

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

@@ -1,15 +1,18 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
@@ -23,6 +26,9 @@
import javax.annotation.Resource;

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

import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
@@ -44,22 +50,16 @@
    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;

    @InnerAuth
    @PostMapping("/getAuctionSalesroomOne")
    @ResponseBody
    public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
        AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
        return R.ok(auctionSalesroomOne);

    }
    @Resource
    private AuctionGoodsMapper AuctionGoodsMapper;

    /**
     * 拍卖大屏获取拍卖信息
     *
     */
   @PostMapping("getAuctionBidRecordList")
   @PostMapping("/getAuctionBidRecordList")
    @ApiOperation(value = "拍卖大屏-获取拍卖信息")
    public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
    public R<List<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
        return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));

    }
@@ -70,7 +70,7 @@
     */
   @PostMapping("/getBaaner")
    @ApiOperation(value = "拍卖大屏-暖场视频or封面海报")
    public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
    public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
        return R.ok(iAuctionSalesroomService.getBaaner(ctionSalesroomGoodsDTO));
    }

@@ -81,11 +81,19 @@
        return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
    }

   @PostMapping("/actionMiniLogin")
    @PostMapping("/actionMiniLogin")
    @ApiOperation(value = "拍卖师端-第三方登陸")
    public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
        return R.ok(iAuctionSalesroomService.actionMiniLogin(appMiniLoginDto));
    }

    @PostMapping("/isMiniLogin")
    @ApiOperation(value = "拍卖师端-判断是否是拍卖师")
    public R<AppMiniLoginVO> isMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
        return R.ok(iAuctionSalesroomService.isMiniLogin(appMiniLoginDto));
    }




   @PostMapping("/getMemberAuctionSalesroomList")
@@ -109,7 +117,18 @@
   @PostMapping("/SaveSignUpNow")
    @ApiOperation(value = "用户端-拍卖立即报名")
    public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
        return R.ok( iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO));
      if (memberAuctionSalesroomBondDTO.getBondType()==1){
          AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
          if (auctionGoods.getEndTime().isAfter(LocalDateTime.now())){
              throw new ServiceException("商品拍卖已结束");
          }
          if (auctionGoods.getListingStatus().getCode()==1){
              throw new ServiceException("商品拍卖下线");
          }
      }
       PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO);

       return R.ok(payInfoVO);
    }


@@ -124,9 +143,9 @@
     * 拍卖师端拍卖场立即开始
     *
     */
   @PostMapping("/auctionSalesroomStart")
    @PostMapping("/auctionSalesroomStart")
    @ApiOperation(value = "拍卖师端-拍卖场立即开始")
    public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
    public R auctionSalesroomStart(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
        iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
        return R.ok();
    }
@@ -138,7 +157,7 @@
     */
   @PostMapping("/auctionSalesroomEnd")
    @ApiOperation(value = "拍卖师端-拍卖场立即结束")
    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
        iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
        return R.ok();
    }