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

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

@@ -85,6 +85,7 @@ public class AuctionConfigDaoImpl implements AuctionConfigDao {
         JdbcHelper.ifPresent(dto.getCreatorId(), criteria::andCreatorIdEqualTo);
         JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
         JdbcHelper.ifPresent(dto.getFilterItemIds(), criteria::andItemIdNotIn);
+        JdbcHelper.ifPresent(dto.getIsValid(), criteria::andIsValidEqualTo);
         example.setOrderByClause(" update_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return auctionConfigMapper.selectByExample(example);

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

@@ -127,9 +127,10 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             specialPerformanceConfigRequestDto.setPage(dto.getPage());
             specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
             specialPerformanceConfigRequestDto.setSpecialPerformanceId(specialPerformanceId);
-            //排除待上架的商品
+            //排除待上架的商品、已截拍失效的商品
             AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
             auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
+            auctionConfigRequestDto.setIsValid(false);
             auctionConfigRequestDto.setLimit(9999);
             List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
             List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
@@ -215,6 +216,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 //排除待上架的商品
                 AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
                 auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
+                auctionConfigRequestDto.setIsValid(false);
                 auctionConfigRequestDto.setLimit(9999);
                 List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
                 List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());