Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java

@@ -14,11 +14,10 @@
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
@@ -60,13 +59,10 @@
    private GoodsSkuClient goodsSkuClient;

    @Resource
    private IAuctionSalesroomService iAuctionSalesroomService;
    private AuctionSalesroomMapper auctionSalesroomMapper;

    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;

    @Resource
    private IAuctionBidRecordService iAuctionBidRecordService;
    private AuctionBidRecordMapper auctionBidRecordMapper;

    @Resource
    private MemberClient emberClient;
@@ -74,8 +70,7 @@
    @Resource
    private OrderClient orderClient;

    @Resource
    private IAuctionBrowseRecordService iAuctionBrowseRecordService;




@@ -86,7 +81,8 @@
    @Override
    public ForepartAuctionSalesroomGoodsVO getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
        AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
                ationSalesroomGoodsDTO.getAuctionSalesroomId());
        forepartAuctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId());
        forepartAuctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName());
        forepartAuctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode());
@@ -94,7 +90,7 @@
        wrapper.eq(AuctionSalesroomGoods::getStatus,1);
        wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper);
        AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper);
        if (auctionSalesroomGoods==null){
            LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
            wrapper1.eq(AuctionSalesroomGoods::getStatus,2);
@@ -102,7 +98,7 @@
            wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
            wrapper1.orderByAsc(AuctionSalesroomGoods::getSortNum);
            wrapper1.last("limit 1");
            auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
            auctionSalesroomGoods = this.getOne(wrapper1);
            if (auctionSalesroomGoods==null){
                LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
                wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
@@ -110,7 +106,7 @@
                wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
                wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
                wrapper2.last("limit 1");
                auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
                auctionSalesroomGoods = this.getOne(wrapper2);
            }
        }
        GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER)
@@ -132,7 +128,7 @@
            wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
            wrapper1.eq(AuctionSalesroomGoods::getSortNum,auctionSalesroomGoods.getSortNum()+1);
            wrapper1.last("limit 1");
            AuctionSalesroomGoods auctionSalesroomGoods1=iAuctionSalesroomGoodsService.getOne(wrapper1);
            AuctionSalesroomGoods auctionSalesroomGoods1 = this.getOne(wrapper1);
            if (auctionSalesroomGoods1!=null){
                GoodsSku goodsSku1 = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods1.getGoodsSkuId(), SecurityConstants.INNER)
                        .getData();
@@ -152,7 +148,8 @@
    @Override
    public AuctionSalesroomVO getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
        AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
                ationSalesroomGoodsDTO.getAuctionSalesroomId());
        AuctionSalesroomVO auctionSalesroomVO=new AuctionSalesroomVO();
        auctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
        auctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
@@ -168,7 +165,7 @@
            wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
            wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
            wrapper.orderByAsc(AuctionSalesroomGoods::getSortNum);
            List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper);
            List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper);
            for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
                ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO1=new ForepartAuctionSalesroomGoodsVO();
                R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
@@ -185,7 +182,7 @@
            wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
            wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
            wrapper.last("limit 1");
            AuctionSalesroomGoods auctionSalesroomGoods= iAuctionSalesroomGoodsService.getOne(wrapper);
            AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper);
            ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods=  new ForepartAuctionSalesroomGoodsVO();
            R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
                    auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
@@ -200,7 +197,7 @@
            wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
            wrapper1.eq(AuctionSalesroomGoods::getSortNum,auctionSalesroomGoods.getSortNum()+1);
            wrapper1.last("limit 1");
            AuctionSalesroomGoods auctionSalesroomGoods1=iAuctionSalesroomGoodsService.getOne(wrapper1);
            AuctionSalesroomGoods auctionSalesroomGoods1 = this.getOne(wrapper1);
            ForepartAuctionSalesroomGoodsVO nextAuctionSalesroomGoods=  new ForepartAuctionSalesroomGoodsVO();
            if (auctionSalesroomGoods1!=null){
                list.add(auctionSalesroomGoods.getSortNum()+1);
@@ -217,7 +214,7 @@
            wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
            wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
            wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus);
            List<AuctionSalesroomGoods> auctionSalesroomGoods2=iAuctionSalesroomGoodsService.list(wrapper2);
            List<AuctionSalesroomGoods> auctionSalesroomGoods2 = this.list(wrapper2);
            for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods2){
                ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO1=new ForepartAuctionSalesroomGoodsVO();
                R<GoodsSku> goodsSkuOne2 = goodsSkuClient.getGoodsSkuOne(
@@ -272,10 +269,11 @@
     */
    @Override
    public void auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
        AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
                ationSalesroomGoodsDTO.getAuctionSalesroomId());
        auctionSalesroom.setStatus(AuctionStartStatusEnum.IN_AUCTION);
        auctionSalesroom.setStartTime(LocalDateTime.now());
        iAuctionSalesroomService.updateById(auctionSalesroom);
        auctionSalesroomMapper.updateById(auctionSalesroom);

        LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
        wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
@@ -283,9 +281,9 @@
        wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
        wrapper2.last("limit 1");
        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
        AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper2);
        auctionSalesroomGoods.setStatus(AuctionStartStatusEnum.IN_AUCTION);
        iAuctionSalesroomGoodsService.updateById(auctionSalesroomGoods);
        this.updateById(auctionSalesroomGoods);

    }

@@ -296,16 +294,17 @@
     */
    @Override
    public void auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
        AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
                ationSalesroomGoodsDTO.getAuctionSalesroomId());
        auctionSalesroom.setStatus(AuctionStartStatusEnum.ENDED);
        auctionSalesroom.setEndTime(LocalDateTime.now());
        iAuctionSalesroomService.updateById(auctionSalesroom);
        auctionSalesroomMapper.updateById(auctionSalesroom);

        LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
        wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
        wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
        wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
        List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper2);
        List<AuctionSalesroomGoods> auctionSalesroomGoods=this.list(wrapper2);
        if (auctionSalesroomGoods.size()>0){
            for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
                salesroomGoods.setStatus(AuctionStartStatusEnum.ENDED);
@@ -325,7 +324,7 @@
        wrapper.eq(AuctionBidRecord::getAuctionSalesroomId, ationSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper.eq(AuctionBidRecord::getDelFlag, 0);
        wrapper.eq(AuctionBidRecord::getStatus,0);
        List<AuctionBidRecord>auctionBidRecordList = iAuctionBidRecordService.list(wrapper);
        List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
        for (AuctionBidRecord auctionBidRecord:auctionBidRecordList){
            list.add(auctionBidRecord.getMemberId());
        }
@@ -349,7 +348,7 @@
        wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
        wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
        wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
        List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper2);
        List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper2);
        return auctionSalesroomGoods;
    }

@@ -364,9 +363,9 @@
        wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,auctionSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
        wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
        AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
        auctionSalesroomGoods.setStatus(AuctionStartStatusEnum.IN_AUCTION);
        iAuctionSalesroomGoodsService.updateById(auctionSalesroomGoods);
        this.updateById(auctionSalesroomGoods);


    }
@@ -383,10 +382,10 @@
        wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,auctionSalesroomGoodsDTO.getAuctionSalesroomId());
        wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
        wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
        AuctionSalesroomGoods auctionSalesroomGood=iAuctionSalesroomGoodsService.getOne(wrapper2);
        AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGood.getAuctionSalesroomId());
        AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2);
        AuctionSalesroom auctionSalesroom=this.getById(auctionSalesroomGood.getAuctionSalesroomId());

        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
        AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
        List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();

        if (auctionSalesroomGoods.getStatus().getCode()==1) {
@@ -394,7 +393,7 @@
            wrapper.eq(AuctionBidRecord::getTargetId, auctionSalesroomGoodsDTO.getGoodsSkuId());
            wrapper.eq(AuctionBidRecord::getDelFlag, 0);
            wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
            auctionBidRecordList = iAuctionBidRecordService.list(wrapper);
            auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
            if(auctionBidRecordList.size()>0){
                //判断
                if (auctionBidRecordList.size() >= auctionSalesroomGoods.getSalesroomStock()) {
@@ -419,26 +418,18 @@
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
                    }
                }
            }else {
                // 没有人出价，退回拍卖商品库存
                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
                goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getSalesroomStock());
                goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                        SecurityConstants.INNER);
            }

        }

        auctionSalesroomGood.setStatus(AuctionStartStatusEnum.ENDED);
        iAuctionSalesroomGoodsService.updateById(auctionSalesroomGood);
        this.updateById(auctionSalesroomGood);

    }

    @Override
    public AuctionSalesroomGoodsInfoVO getAuctionSalesroomGoodsInfo(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
        AuctionSalesroom byId = iAuctionSalesroomService.getById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
        AuctionSalesroomGoods byId1 = iAuctionSalesroomGoodsService.getById(auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        AuctionSalesroom byId = auctionSalesroomMapper.selectById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
        AuctionSalesroomGoods byId1 = this.getById(auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
        AuctionSalesroomGoodsInfoVO AuctionSalesroomGoodsInfoVO=new AuctionSalesroomGoodsInfoVO();
        AuctionSalesroomGoodsInfoVO.setSalesroomId(byId.getId());
@@ -473,7 +464,7 @@
        wrapper1.eq(AuctionBidRecord::getAuctionType,2);
        wrapper1.eq(AuctionBidRecord::getTargetId,byId1.getId());
        wrapper1.eq(AuctionBidRecord::getDelFlag,0);
        AuctionBidRecord list1 = iAuctionBidRecordService.getOne(wrapper1);
        AuctionBidRecord list1 = auctionBidRecordMapper.selectOne(wrapper1);
        if (list1!=null){
            AuctionSalesroomGoodsInfoVO.setIsBond(2);
            AuctionSalesroomGoodsInfoVO.setPresentBid(list1.getLastBidAmount());
@@ -498,7 +489,7 @@
        wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
        wrapper.last("limit 10");
        List<AuctionBidRecord> auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
        List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
        List<AuctionBidRecordVO> auctionBidRecordVOList=new ArrayList<>();
        for (int i=0;i<auctionBidRecordList.size();i++){
            AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
@@ -517,7 +508,7 @@
        wrapper1.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
        wrapper.last("limit 1");
        AuctionBidRecord auctionBidRecord=iAuctionBidRecordService.getOne(wrapper);
        AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper);

        LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
        wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
@@ -525,7 +516,7 @@
        wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
        wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
        wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
        Long count=iAuctionBidRecordService.count(wrapper);
        Long count = auctionBidRecordMapper.selectCount(wrapper);
        if (count>0){
            AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
            auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
@@ -547,7 +538,7 @@
        order.setOrderTime(LocalDateTime.now());
        order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
        order.setMemberId(memberId);
        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(goodsSkuId);
        AuctionSalesroomGoods auctionSalesroomGoods = this.getById(goodsSkuId);
        order.setGoodsQuantity(1);
        order.setTotalAmount(lastBidAmount);