专场列表首页展示排除已经截拍的商品2

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/AuctionConfigDao.java

@@ -59,6 +59,12 @@ public interface AuctionConfigDao {
 
     List<AuctionConfig> findList(AuctionConfigRequestDto dto);
 
+    /**
+     * 查询状态是待上架的或者是已经过了截拍时间的商品
+     * @param dto
+     * @return
+     */
+    List<AuctionConfig> findSpecialPerformanceFilterList(AuctionConfigRequestDto dto);
 
     /**
      * 查询截拍后在一小时内的拍卖配置

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/AuctionConfigRequestDto.java

@@ -17,6 +17,8 @@ public class AuctionConfigRequestDto extends BaseRequestDto implements Entity {
      */
     private Long itemId;
 
+    private List<Long> itemIdList;
+
     private List<Long> filterItemIds;
 
     /**

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/AuctionConfigDaoImpl.java

@@ -3,15 +3,13 @@ package com.wwdz.ch.db.impl.distribution;
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.distribution.AuctionConfigDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
-import com.wwdz.ch.db.domain.distribution.AuctionConfig;
-import com.wwdz.ch.db.domain.distribution.AuctionConfigExample;
-import com.wwdz.ch.db.domain.distribution.DistributionOrderExample;
-import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.distribution.AuctionConfigRequestDto;
 import com.wwdz.ch.db.mapper.distribution.AuctionConfigMapper;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -91,6 +89,20 @@ public class AuctionConfigDaoImpl implements AuctionConfigDao {
         return auctionConfigMapper.selectByExample(example);
     }
 
+
+
+    @Override
+    public List<AuctionConfig> findSpecialPerformanceFilterList(AuctionConfigRequestDto dto) {
+        AuctionConfigExample example = new AuctionConfigExample();
+        AuctionConfigExample.Criteria criteria = example.createCriteria();
+        criteria.andItemIdIn(dto.getItemIdList());
+        criteria.andStateEqualTo(dto.getState());
+        AuctionConfigExample.Criteria orCriteria = example.or();
+        orCriteria.andItemIdIn(dto.getItemIdList());
+        orCriteria.andIsValidEqualTo(false);
+        return auctionConfigMapper.selectByExample(example);
+    }
+
     @Override
     public int updateRealEndTime(long itemId, Date realEndTime) {
         AuctionConfigExample example = new AuctionConfigExample();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SpecialPerformanceServiceImpl.java

@@ -214,11 +214,14 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
                 specialPerformanceConfigRequestDto.setSpecialPerformanceId(specialPerformanceId);
                 //排除待上架的商品
+                //先查询专场所有的商品,在这个范围内排除待上架和已经截拍的商品
+                List<SpecialPerformanceConfig> allItemList = specialPerformanceConfigDao.findAllItem(specialPerformanceId);
+                List<Long> allItemId = allItemList.stream().map(SpecialPerformanceConfig::getItemId).collect(Collectors.toList());
                 AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+                auctionConfigRequestDto.setItemIdList(allItemId);
                 auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
                 auctionConfigRequestDto.setIsValid(false);
-                auctionConfigRequestDto.setLimit(9999);
-                List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
+                List<AuctionConfig> auctionConfigList = auctionConfigDao.findSpecialPerformanceFilterList(auctionConfigRequestDto);
                 List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(filterItemIdList)) {
                     specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);