...
|
...
|
@@ -1994,6 +1994,7 @@ public class ProductServiceImpl implements ProductService { |
|
|
List<GoodsSize> sizeList = new ArrayList<>();
|
|
|
List<GoodsSize> preSaleSizeList = new ArrayList<>();
|
|
|
List<GoodsSize> secondsSizeList = new ArrayList<>();
|
|
|
List<GoodsSize> bidSizeList = new ArrayList<>();
|
|
|
for (GoodsSize size : allSizeList) {
|
|
|
// 1.现货 9极速 3闪购 海外直邮
|
|
|
if (notAllNull(size.getSkup(), size.getQuickDeliverySkup(), size.getFlashSkup(), size.getHkSkup())) {
|
...
|
...
|
@@ -2005,6 +2006,9 @@ public class ProductServiceImpl implements ProductService { |
|
|
if (notAllNull(size.getSecondHandSkup())) {
|
|
|
secondsSizeList.add(size);
|
|
|
}
|
|
|
if (notAllNull(size.getBidSkup())) { // 求购
|
|
|
bidSizeList.add(size);
|
|
|
}
|
|
|
}
|
|
|
allGoodsBO.setSizeList(null);
|
|
|
|
...
|
...
|
@@ -2020,10 +2024,15 @@ public class ProductServiceImpl implements ProductService { |
|
|
BeanUtils.copyProperties(allGoodsBO, secondsGoodsBO);
|
|
|
secondsGoodsBO.setSizeList(secondsSizeList);
|
|
|
|
|
|
GoodsBO bidGoodsBO = new GoodsBO();
|
|
|
BeanUtils.copyProperties(allGoodsBO, bidGoodsBO);
|
|
|
bidGoodsBO.setSizeList(bidSizeList);
|
|
|
|
|
|
Map<String, List<GoodsBO>> tabs = new HashMap<>();
|
|
|
tabs.put("goods_list", Arrays.asList(goodsBO));
|
|
|
tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
|
|
|
tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO));
|
|
|
tabs.put("bid_goods_list", Arrays.asList(bidGoodsBO));
|
|
|
tabs = JSON.parseObject(JSON.toJSONString(tabs, SerializerFeature.DisableCircularReferenceDetect), Map.class);
|
|
|
product_info.setGoodsListTabs(tabs);
|
|
|
allGoodsBO.setSizeList(allSizeList);
|
...
|
...
|
|