新增商品关注列表

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

@@ -80,4 +80,9 @@ public class SpecialPerformanceRequestDto extends BaseRequestDto implements Enti
      * 搜索内容
      */
     private String searchParam;
+
+    /**
+     * 1查询我的关注商品列表
+     */
+    private Integer searchType;
 }

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

@@ -281,7 +281,22 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             //查询专场下所有的商品
             List<SpecialPerformanceConfig> allItemlist = specialPerformanceConfigDao.findAllItem(dto.getSpecialPerformanceId());
             List<Long> itemIdList = allItemlist.stream().map(SpecialPerformanceConfig::getItemId).collect(Collectors.toList());
+
+            //查询该专场下所有商品的关注记录
+            SpecialPerformanceItemFollowRequestDto specialPerformanceItemFollowRequestDto = new SpecialPerformanceItemFollowRequestDto();
+            specialPerformanceItemFollowRequestDto.setSpecialPerformanceId(dto.getSpecialPerformanceId());
+            specialPerformanceItemFollowRequestDto.setUserId(dto.getUserId());
+            List<SpecialPerformanceItemFollow> specialPerformanceItemFollowList = specialPerformanceItemFollowDao.findAllList(specialPerformanceItemFollowRequestDto);
+            List<Long> followItemList = specialPerformanceItemFollowList.stream().map(SpecialPerformanceItemFollow::getItemId).collect(Collectors.toList());
+            Map<Long, SpecialPerformanceItemFollow> followMap = specialPerformanceItemFollowList.stream()
+                    .collect(Collectors.toMap(SpecialPerformanceItemFollow::getItemId, Function.identity(), (k1,k2)->k2));
+
             SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
+            if (dto.getSearchType() != null && dto.getSearchType() == 1) {
+                if (!CollectionUtils.isEmpty(followItemList)) {
+                    specialPerformanceConfigRequestDto.setItemIdList(followItemList);
+                }
+            }
 
             //判断是否有查询条件
             if (StringUtils.hasLength(dto.getSearchParam())) {
@@ -342,13 +357,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             Date previewStartTime = Date.from(startInstant);
 
             Map<Long, SupplierItem> supplierItemMap = supplierItemList.stream().collect(Collectors.toMap(SupplierItem::getId, Function.identity()));
-            //查询该专场下所有商品的关注记录
-            SpecialPerformanceItemFollowRequestDto specialPerformanceItemFollowRequestDto = new SpecialPerformanceItemFollowRequestDto();
-            specialPerformanceItemFollowRequestDto.setSpecialPerformanceId(dto.getSpecialPerformanceId());
-            specialPerformanceItemFollowRequestDto.setUserId(dto.getUserId());
-            List<SpecialPerformanceItemFollow> specialPerformanceItemFollowList = specialPerformanceItemFollowDao.findAllList(specialPerformanceItemFollowRequestDto);
-            Map<Long, SpecialPerformanceItemFollow> followMap = specialPerformanceItemFollowList.stream()
-                    .collect(Collectors.toMap(SpecialPerformanceItemFollow::getItemId, Function.identity(), (k1,k2)->k2));
+
 
             for (SpecialPerformanceConfig specialPerformanceConfig : list) {
                 long itemId = specialPerformanceConfig.getItemId();