专场列表排除待上架的商品

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

@@ -5,6 +5,7 @@ import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class SpecialPerformanceConfigRequestDto extends BaseRequestDto implements Entity {
@@ -40,4 +41,9 @@ public class SpecialPerformanceConfigRequestDto extends BaseRequestDto implement
      * 状态
      */
     private Integer state;
+
+    /**
+     * 查询时排除的商品id
+     */
+    private List<Long> filterItemIdList;
 }

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

@@ -27,6 +27,7 @@ public class SpecialPerformanceConfigDaoImpl implements SpecialPerformanceConfig
         SpecialPerformanceConfigExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getSpecialPerformanceId(), criteria::andSpecialPerformanceIdEqualTo);
         JdbcHelper.ifPresent(dto.getItemId(), criteria::andItemIdEqualTo);
+        JdbcHelper.ifPresent(dto.getFilterItemIdList(), criteria::andItemIdNotIn);
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         criteria.andStateEqualTo(1);
         return specialPerformanceConfigMapper.selectByExample(example);

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

@@ -17,10 +17,7 @@ import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.UserRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.AuctionRecordRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceConfigRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.wx.entity.vo.distribution.SpecialPerformanceVo;
 import com.wwdz.ch.wx.service.distribution.SpecialPerformanceService;
 import com.xxdxxs.utils.DateUtils;
@@ -114,6 +111,15 @@ 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.setLimit(9999);
+            List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(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);
             specialPerformanceVo.setTotalItemNum(pageInfo.getTotal());
@@ -161,6 +167,15 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             specialPerformanceConfigRequestDto.setPage(dto.getPage());
             specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
             specialPerformanceConfigRequestDto.setSpecialPerformanceId(dto.getSpecialPerformanceId());
+            //排除待上架的商品
+            AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+            auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
+            auctionConfigRequestDto.setLimit(9999);
+            List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(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<SupplierItem> pageInfo = new PageInfo(list);