修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

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

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionBrowseRecordMapper;
@@ -14,25 +13,19 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomWdDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

@@ -84,7 +77,7 @@
            wrapper3.like(AuctionBrowseRecord::getSkuName,auctionGoodsListDTO.getGoodsSkuName());
        }

        Set<Long> goodsSkuIdList = null;
      /*  Set<Long> goodsSkuIdList = null;
        if (auctionGoodsListDTO.getStartStatus()!=null&&auctionGoodsListDTO.getStartStatus()!=4){
            LambdaQueryWrapper<AuctionGoods> wrapper=Wrappers.lambdaQuery();
            wrapper.eq(AuctionGoods::getStartStatus,auctionGoodsListDTO.getStartStatus());
@@ -103,7 +96,7 @@
                goodsSkuIdList.add(0L);
                wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
            }
        }
        }*/

        wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
        Page<AuctionBrowseRecord> page1 = this.page(page, wrapper3);
@@ -135,7 +128,7 @@
    @Override
    public PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomBrowseRecordList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {

        Set<Long> goodsSkuIdList = null;
      /*  Set<Long> goodsSkuIdList = null;
        if (MemberAuctionSalesroomDTO.getStatus()!=4){
            LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
            wrapper.eq(AuctionSalesroom::getStatus,MemberAuctionSalesroomDTO.getStatus());
@@ -143,7 +136,7 @@
            List<AuctionSalesroom> auctionSalesrooms = auctionSalesroomMapper.selectList(wrapper);
            goodsSkuIdList = auctionSalesrooms.stream().map(AuctionSalesroom::getId)
                            .collect(Collectors.toSet());
        }
        }*/



@@ -159,7 +152,7 @@
        wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
                .le(AuctionBrowseRecord::getCreateTime, now);

        if (MemberAuctionSalesroomDTO.getStatus()!=4) {
     /*   if (MemberAuctionSalesroomDTO.getStatus()!=4) {
            if (goodsSkuIdList != null) {
                wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
            } else {
@@ -167,7 +160,7 @@
                goodsSkuIdList.add(0L);
                wrapper3.in(AuctionBrowseRecord::getTargetId,goodsSkuIdList);
            }
        }
        }*/


        wrapper3.orderByDesc(AuctionBrowseRecord::getCreateTime);
@@ -190,12 +183,17 @@
            MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
            memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
            memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
            List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
            if (data1.size()>0){
            LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
            wrapper.eq(AuctionBondJl::getAuctionSalesroomId,auctionSalesroom.getId());
            wrapper.eq(AuctionBondJl::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
            wrapper.eq(AuctionBondJl::getIsState,0);
            AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper);
            if (auctionBondJl!=null){
                auctionSalesroom1.setIsBond(2);
            }else{
                auctionSalesroom1.setIsBond(1);
            }

            MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
            memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());