修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java

@@ -1,28 +1,26 @@
package com.ruoyi.auction.controller.inner;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
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.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import java.util.Collection;
import java.util.List;
import java.util.Set;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
@@ -43,9 +41,66 @@
    @InnerAuth
    @PostMapping("/getAuctionSalesroomOne")
    @ResponseBody
    public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
        AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
    public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
        AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
        return R.ok(auctionSalesroomOne);

    }

    @InnerAuth
    @PostMapping("/list-by-ids")
    R<List<AuctionSalesroom>> getAuctionSalesroomByIds(
            @RequestBody Collection<Long> auctionSalesroomGoodsIdSet) {

        return R.ok(iAuctionSalesroomService.getAuctionSalesroomByIds(auctionSalesroomGoodsIdSet));
    }

    /**
     * 根据商品id获取正在进行的拍卖会
     *
     * @param id 商品id
     * @return
     */
    @InnerAuth
    @GetMapping("/getAuctionSalesroomBySkuId/{id}")
    R<List<AuctionSalesroom>> getAuctionSalesroomBySkuId(@PathVariable("id") Long id) {
        return R.ok(iAuctionSalesroomService.getAuctionSalesroomBySkuId(id));
    }

    /**
     * 获取拍卖商品
     *
     * @param goodsSkuId
     * @return
     */
    @InnerAuth
    @GetMapping("/getAuctionSalesroomGoodsById/{goodsSkuId}")
    R<AuctionSalesroomGoods> getAuctionSalesroomGoodsById(
            @PathVariable("goodsSkuId") Long goodsSkuId) {
        return R.ok(iAuctionSalesroomService.getAuctionSalesroomGoodsById(goodsSkuId));
    }

    @InnerAuth
    @GetMapping("/getAuctionBondJLByTargetId")
    R<AuctionBondJl> getAuctionBondJLBySalesroomId(
            @RequestParam("targetId") Long targetId,
            @RequestParam("memberId") Long memberId,
            @RequestParam("bondType") Integer bondType) {
        return R.ok(iAuctionSalesroomService.getAuctionBondJLBySalesroomId(targetId,
                memberId, bondType));
    }

    /**
     * 根据拍卖场商品id获取商品信息
     *
     * @param auctionSalesroomGoodsSet
     * @return
     */
    @InnerAuth
    @PostMapping("/getGoodsSkuByAuctionSalesroomGoodsSet")
    R<List<GoodsSku>> getGoodsSkuByAuctionSalesroomGoodsSet(
            @RequestBody Set<Long> auctionSalesroomGoodsSet) {
        return R.ok(iAuctionSalesroomService.getGoodsSkuByAuctionSalesroomGoodsSet(
                auctionSalesroomGoodsSet));
    }
}