修改bug

rentaiming

2024-07-31 c24c5c44ea1d0e0c32feadfb6dea3b6efa0694fc

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

@@ -1,11 +1,21 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
@@ -14,7 +24,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
@@ -22,6 +31,10 @@
import javax.annotation.Resource;

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

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

/**
 * <p>
@@ -43,13 +56,19 @@
    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;

    @Resource
    private AuctionGoodsMapper AuctionGoodsMapper;

    @Resource
    private AuctionBondJlMapper  auctionBondJlMapper;

    /**
     * 拍卖大屏获取拍卖信息
     *
     */
   @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));

    }
@@ -60,7 +79,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));
    }

@@ -71,12 +90,17 @@
        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")
    @ApiOperation(value = "用户端-拍卖场信息列表")
@@ -99,7 +123,34 @@
   @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.getListingStatus().getCode()==1){
              throw new ServiceException("商品拍卖下线");
          }
      }else{
          AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
          if(byId==null){
              LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery();
              wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
              wrapper.eq(AuctionSalesroom::getDelFlag,0);
              byId =iAuctionSalesroomService.getOne(wrapper);
              memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId());
          }
      }

       AuctionBondJl auctionBondJl=new AuctionBondJl();
       auctionBondJl.setAuctionGoodsId(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
       auctionBondJl.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
       auctionBondJl.setIsState(0);
       auctionBondJl.setBondType(memberAuctionSalesroomBondDTO.getBondType());
       auctionBondJl.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
       auctionBondJlMapper.insert(auctionBondJl);


       PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO);

       return R.ok(payInfoVO);
    }


@@ -107,6 +158,35 @@
    @ApiOperation(value = "用户端-拍卖取消报名")
    public R CancelSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
        iAuctionSalesroomService.CancelSignUpNow(memberAuctionSalesroomBondDTO);


       if (memberAuctionSalesroomBondDTO.getBondType()==2){
           AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
           if(byId==null){
               LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery();
               wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
               wrapper.eq(AuctionSalesroom::getDelFlag,0);
               byId =iAuctionSalesroomService.getOne(wrapper);
               memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId());
           }
           LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
           wrapper.eq(AuctionBondJl::getAuctionSalesroomId,byId.getId());
           wrapper.eq(AuctionBondJl::getAuctionGoodsId,memberAuctionSalesroomBondDTO.getAuctionGoodsId());
           wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomBondDTO.getMemberId());
           wrapper.eq(AuctionBondJl::getIsState,0);
           AuctionBondJl auctionSalesroom = auctionBondJlMapper.selectOne(wrapper);
           auctionSalesroom.setIsState(1);
           auctionBondJlMapper.updateById(auctionSalesroom);

       }else{
           LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
           wrapper.eq(AuctionBondJl::getAuctionGoodsId,memberAuctionSalesroomBondDTO.getAuctionGoodsId());
           wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomBondDTO.getMemberId());
           wrapper.eq(AuctionBondJl::getIsState,0);
           AuctionBondJl auctionSalesroom = auctionBondJlMapper.selectOne(wrapper);
           auctionSalesroom.setIsState(1);
           auctionBondJlMapper.updateById(auctionSalesroom);
       }
        return R.ok( );
    }

@@ -114,9 +194,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();
    }
@@ -128,7 +208,7 @@
     */
   @PostMapping("/auctionSalesroomEnd")
    @ApiOperation(value = "拍卖师端-拍卖场立即结束")
    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
        iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
        return R.ok();
    }