转场商品列表新增筛选

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

@@ -27,6 +27,8 @@ public class SpecialPerformanceConfigRequestDto extends BaseRequestDto implement
      */
     private Long itemId;
 
+    private List<Long> itemIdList;
+
     /**
      * 编号
      */

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

@@ -73,4 +73,9 @@ public class SpecialPerformanceRequestDto extends BaseRequestDto implements Enti
     private Date startQueryTime;
 
     private Date endQueryTime;
+
+    /**
+     * 搜索内容
+     */
+    private String searchParam;
 }

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

@@ -30,6 +30,8 @@ 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.getItemIdList(), criteria::andItemIdIn);
+        JdbcHelper.ifPresent(dto.getLot(), criteria::andLotEqualTo);
         JdbcHelper.ifPresent(dto.getFilterItemIdList(), criteria::andItemIdNotIn);
         criteria.andStateEqualTo(1);
         example.setOrderByClause("lot asc");

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

@@ -22,6 +22,7 @@ import com.wwdz.ch.wx.entity.vo.distribution.SpecialPerformanceVo;
 import com.wwdz.ch.wx.service.distribution.SpecialPerformanceService;
 import com.xxdxxs.utils.DateUtils;
 import com.xxdxxs.utils.EntityMapper;
+import com.xxdxxs.utils.JsonUtils;
 import com.xxdxxs.utils.StringUtils;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
@@ -269,7 +270,27 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             }
             Map<String, Object> resultMap = new HashMap<>();
             List<SupplierItemVo> supplierItemVos = new ArrayList<>();
+            //查询专场下所有的商品
+            List<SpecialPerformanceConfig> allItemlist = specialPerformanceConfigDao.findAllItem(dto.getSpecialPerformanceId());
+            List<Long> itemIdList = allItemlist.stream().map(SpecialPerformanceConfig::getItemId).collect(Collectors.toList());
             SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
+
+            //判断是否有查询条件
+            if (StringUtils.hasLength(dto.getSearchParam())) {
+                //是否为纯数字
+                if (dto.getSearchParam().matches("\\d+")) {
+                    specialPerformanceConfigRequestDto.setLot(Integer.valueOf(dto.getSearchParam()));
+                } else {
+                    SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+                    supplierItemRequestDto.setIds(itemIdList);
+                    supplierItemRequestDto.setName(dto.getSearchParam());
+                    supplierItemRequestDto.setPage(dto.getPage());
+                    supplierItemRequestDto.setLimit(dto.getLimit());
+                    List<SupplierItem> supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
+                    List<Long> itemIds = supplierItemList.stream().map(SupplierItem::getId).collect(Collectors.toList());
+                    specialPerformanceConfigRequestDto.setItemIdList(itemIds);
+                }
+            }
             specialPerformanceConfigRequestDto.setPage(dto.getPage());
             specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
             specialPerformanceConfigRequestDto.setSortColumn(dto.getSortColumn());
@@ -285,7 +306,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
             }
             List<SpecialPerformanceConfig> list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
-            PageInfo<SupplierItem> pageInfo = new PageInfo(list);
+            PageInfo<SpecialPerformanceConfig> pageInfo = new PageInfo(list);
 
             resultMap.put("backgroundImage", specialPerformance.getBackgroundImage());
             //商品总数
@@ -294,8 +315,6 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             long totalViewNum = specialPerformanceConfigDao.countViewNum(dto.getSpecialPerformanceId());
             resultMap.put("totalViewNum", totalViewNum);
             //出价总数
-            List<SpecialPerformanceConfig> allItemlist = specialPerformanceConfigDao.findAllItem(dto.getSpecialPerformanceId());
-            List<Long> itemIdList = allItemlist.stream().map(SpecialPerformanceConfig::getItemId).collect(Collectors.toList());
             AuctionRecordRequestDto auctionRecordRequestDtoOfTotal = new AuctionRecordRequestDto();
             auctionRecordRequestDtoOfTotal.setItemIdList(itemIdList);
             long totalOfferNum = auctionRecordDao.count(auctionRecordRequestDtoOfTotal);