专场

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

@@ -21,7 +21,6 @@ public interface SpecialPerformanceDao {
 
     /**
      * 查询当天结束的专场
-     * @param dto
      * @return
      */
     List<SpecialPerformance> findTodayEndList();

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

@@ -233,10 +233,12 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 auctionConfigRequestDto.setItemIdList(allItemId);
                 auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
                 auctionConfigRequestDto.setIsValid(false);
-                List<AuctionConfig> auctionConfigList = auctionConfigDao.findSpecialPerformanceFilterList(auctionConfigRequestDto);
-                List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
-                if (!CollectionUtils.isEmpty(filterItemIdList)) {
-                    specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
+                if (specialPerformance.getState() != SpecialPerformanceEnum.StateEnum.END.getCode()) {
+                    List<AuctionConfig> auctionConfigList = auctionConfigDao.findSpecialPerformanceFilterList(auctionConfigRequestDto);
+                    List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(filterItemIdList)) {
+                        specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
+                    }
                 }
                 List<SpecialPerformanceConfig> list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
                 PageInfo pageInfo = new PageInfo<>(list);