Authored by wujiexiang

Merge branch 'test6.9.13' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.13

... ... @@ -229,6 +229,12 @@ public class ProductServiceImpl implements ProductService {
productInfo.setQuickDeliveryPrice(quickDeliveryLeastPrice);
}
List<BigDecimal> bidMosterPriceList = goodsSizes.stream().map(GoodsSize::getBidMosterPrice).filter(Objects::nonNull).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(bidMosterPriceList)) {
BigDecimal bidMosterPrice = bidMosterPriceList.stream().max((p1, p2) -> (p1.compareTo(p2))).get();
productInfo.setMosterPrice(bidMosterPrice);
}
goodsSizes.sort(Comparator.comparing(GoodsSize::getOrderBy));
List<JSONObject> otherAddSizeList = getOtherSizeList(product.getMaxSortId(), product.getMidSortId(), goodsSizes);
if(!CollectionUtils.isEmpty(otherAddSizeList)) {
... ...