修改bug

rentaiming

2024-07-31 20b8e50ddb2daf21d65a43ec363e5925edb5b10e

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

@@ -24,7 +24,10 @@
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.domain.*;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
@@ -60,6 +63,7 @@
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Member;
@@ -414,11 +418,13 @@
           }else{
               memberAuctionSalesroomVO.setIsApply(1);
           }
            MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
            memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
            List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
            if(data1!=null){
                memberAuctionSalesroomVO.setApplyNum(data1.size());
            LambdaQueryWrapper<AuctionBondJl> wrapper1=Wrappers.lambdaQuery();
            wrapper1.eq(AuctionBondJl::getAuctionSalesroomId,auctionSalesroom.getId());
            wrapper1.eq(AuctionBondJl::getBondType,2);
            wrapper1.eq(AuctionBondJl::getIsState,0);
            java.util.List<AuctionBondJl> auctionBondJls = auctionBondJlMapper.selectList(wrapper1);
            if(auctionBondJls!=null){
                memberAuctionSalesroomVO.setApplyNum(auctionBondJls.size());

            }else{
                memberAuctionSalesroomVO.setApplyNum(0);
@@ -544,14 +550,15 @@
        wrapper3.eq(AuctionBrowseRecord::getTargetId,memberAuctionSalesroomDTO.getAuctionSalesroomId());
        wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.AUCTION_ITEMS);
        wrapper3.eq(AuctionBrowseRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
        wrapper3.ge(AuctionBrowseRecord::getCreateTime, now)
                .le(AuctionBrowseRecord::getCreateTime, newTime7);
        wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
                .le(AuctionBrowseRecord::getCreateTime, now);
        List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
        if (list.size()==0){
            AuctionBrowseRecord auctionBrowseRecord=new AuctionBrowseRecord();
            auctionBrowseRecord.setBrowseType(AuctionOrderTypeEnum.AUCTION_ITEMS);
            auctionBrowseRecord.setMemberId(memberAuctionSalesroomDTO.getMemberId());
            auctionBrowseRecord.setTargetId(memberAuctionSalesroomDTO.getAuctionSalesroomId());
            auctionBrowseRecord.setSkuName(byId.getSalesroomName());
            iAuctionBrowseRecordService.save(auctionBrowseRecord);
        }

@@ -1080,9 +1087,9 @@
                "        WHEN status = 0 THEN 2\n" +
                "        WHEN status = 1 THEN 1\n" +
                "        WHEN status = 2 THEN 3\n" +
                "        END,status");
                "        END,status asc ");

        Page<AuctionSalesroom> auctionSalesroomList=this.page(Page.of(memberAuctionSalesroomDTO.getPageCurr(),memberAuctionSalesroomDTO.getPageSize()),wrapper1);
        Page<AuctionSalesroom> auctionSalesroomList=this.page(page,wrapper1);
        PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
        List<WdMemberAuctionSalesroomVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
        for (WdMemberAuctionSalesroomVO auctionSalesroom:list){
@@ -1090,6 +1097,7 @@
            MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
            memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
            memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
            auctionSalesroom.setIsBond(2);
            List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
            if (data1.size()>0){
                auctionSalesroom.setBondTime(data1.get(0).getCreateTime());
@@ -1458,7 +1466,7 @@
                Wrappers.lambdaQuery(AuctionBidRecord.class)
                        .eq(AuctionBidRecord::getAuctionSalesroomId,
                                auctionSalesroomGoods.getAuctionSalesroomId())
                        .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getGoodsSkuId())
                        .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getId())
                        .eq(AuctionBidRecord::getAuctionType, AuctionOrderTypeEnum.AUCTION_ITEMS)
                        .orderByDesc(AuctionBidRecord::getLastBidAmount));
        if (CollUtils.isNotEmpty(auctionBidRecordList)) {
@@ -1471,7 +1479,7 @@
                    auctionBidRecords.add(auctionBidRecord);
                }
            } else {
                for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
                for (int i = 0; i < auctionBidRecordList.size(); i++) {
                    AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
                    auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
                    auctionBidRecordMapper.updateById(auctionBidRecord);
@@ -1729,4 +1737,32 @@
                        Collectors.toSet());
        return this.listByIds(auctionSalesroomIdSet);
    }

    /**
     * 根据商品id获取正在进行的拍卖会
     *
     * @param id 商品id
     * @return
     */
    @Override
    public List<AuctionSalesroom> getAuctionSalesroomBySkuId(Long id) {
        List<AuctionSalesroomGoods> auctionSalesroomGoods = auctionSalesroomGoodsMapper.selectList(
                new LambdaQueryWrapper<AuctionSalesroomGoods>().eq(
                                AuctionSalesroomGoods::getGoodsSkuId, id)
                        .groupBy(AuctionSalesroomGoods::getAuctionSalesroomId));
        if (CollUtils.isNotEmpty(auctionSalesroomGoods)) {
            Set<Long> auctionSalesroomIdSet = auctionSalesroomGoods.stream()
                    .map(AuctionSalesroomGoods::getAuctionSalesroomId).collect(
                            Collectors.toSet());
            return this.lambdaQuery()
                    .eq(AuctionSalesroom::getStatus, AuctionStartStatusEnum.IN_AUCTION).in(
                            AuctionSalesroom::getId, auctionSalesroomGoods).list();
        }
        return CollUtils.emptyList();
    }

    @Override
    public AuctionSalesroomGoods getAuctionSalesroomGoodsById(Long goodsSkuId) {
        return auctionSalesroomGoodsMapper.selectById(goodsSkuId);
    }
}