...
|
...
|
@@ -170,13 +170,16 @@ public class SizePoolService implements ISizePoolService{ |
|
|
resp.setRangeTypeStr(getRangeTypeStr(pool.getRangeType()));
|
|
|
resp.setImageUrl(pool.getImageUrl());
|
|
|
List<SizePoolDetail> itemList = poolIdMap.get(pool.getId());
|
|
|
if(pool.getRangeType().equals(RANGE_TYPE_BRAND)) {
|
|
|
Map<Integer, List<SizePoolDetail>> isIncludeMap = itemList.stream().collect(Collectors.groupingBy(SizePoolDetail::getIsInclude));
|
|
|
resp.setIncludeItems(brandMapper.selectOneById(isIncludeMap.get(1).get(0).getItemId()).getBrandName());
|
|
|
resp.setNotIncludeItems(getIsIncludeItemStr(isIncludeMap.get(0)));
|
|
|
}else if(pool.getRangeType().equals(ITEM_TYPE_PRODUCT)) {
|
|
|
resp.setIncludeItems(getIsIncludeItemStr(itemList));
|
|
|
if(CollectionUtils.isNotEmpty(itemList)) {
|
|
|
if(pool.getRangeType().equals(RANGE_TYPE_BRAND)) {
|
|
|
Map<Integer, List<SizePoolDetail>> isIncludeMap = itemList.stream().collect(Collectors.groupingBy(SizePoolDetail::getIsInclude));
|
|
|
resp.setIncludeItems(brandMapper.selectOneById(isIncludeMap.get(1).get(0).getItemId()).getBrandName());
|
|
|
resp.setNotIncludeItems(getIsIncludeItemStr(isIncludeMap.get(0)));
|
|
|
}else if(pool.getRangeType().equals(ITEM_TYPE_PRODUCT)) {
|
|
|
resp.setIncludeItems(getIsIncludeItemStr(itemList));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
respList.add(resp);
|
|
|
}
|
|
|
|
...
|
...
|
|