拍品列表新增状态筛选项

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -15,12 +15,10 @@ import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.db.dao.SwitchDao;
 import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.distribution.AuctionConfigRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.AuctionRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
-import com.xxdxxs.utils.CommonUtils;
-import com.xxdxxs.utils.DateUtils;
-import com.xxdxxs.utils.EntityMapper;
-import com.xxdxxs.utils.StringUtils;
+import com.xxdxxs.utils.*;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SysSupplierItemServiceImpl implements SysSupplierItemService {
@@ -196,10 +195,27 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
     @Override
     public Result findAuctionList(SupplierItemRequestDto dto) {
         try {
-            List<SupplierItemVo> supplierItemVos = new ArrayList<>();
+            PageInfo pageInfo = null;
+            List<SupplierItem> supplierItemList = new ArrayList<>();
+            if (dto.getAuctionState() != null) {
+                AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+                auctionConfigRequestDto.setPage(dto.getPage());
+                auctionConfigRequestDto.setLimit(dto.getLimit());
+                auctionConfigRequestDto.setState(dto.getAuctionState());
+                List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
+                pageInfo = new PageInfo(auctionConfigList);
+                List<Long> itemIds = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
+                if (!org.springframework.util.CollectionUtils.isEmpty(itemIds)) {
+                    SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+                    dto.setIds(itemIds);
+                    supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
+                }
+            } else {
                 dto.setType(DistributionEnum.DistributionTypeEnum.AUCTION.getCode());
-            List<SupplierItem> supplierItemList = supplierItemDao.findList(dto);
-            PageInfo<SupplierItem> pageInfo = new PageInfo(supplierItemList);
+                supplierItemList = supplierItemDao.findList(dto);
+                pageInfo = new PageInfo(supplierItemList);
+            }
+            List<SupplierItemVo> supplierItemVos = new ArrayList<>();
             supplierItemList.forEach(supplierItem -> {
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
                 EntityMapper.copyAttribute(supplierItem, supplierItemVo);

ch-core/src/main/java/com/wwdz/ch/core/consts/AuctionEnum.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.core.consts;
 public class AuctionEnum {
 
     /**
-     * 售后单状态
+     * 拍品状态
      */
     public enum StateEnum {
         WAIT_ON_SALE(1, "待上架"),

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

@@ -186,6 +186,12 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
      */
     private String sortColumn;
 
+    /**
+     * 竞拍品的拍卖状态
+     */
+    private Integer auctionState;
+
+    private String auctionStateName;
 
 
 }