Authored by caoyan

Merge branch 'dev_suggestPrice_20181119' into test6.8.2

... ... @@ -273,15 +273,18 @@ public class ChannelSkuCompareServiceImpl implements IChannelSkuCompareService,
BigDecimal ufoMinPrice = null == productMap.get(csc.getProductId()) ? null : productMap.get(csc.getProductId()).getMinPrice();
bo.setUfoMinPrice(getFormatPrice(ufoMinPrice));
//毒当前价低于UFO价格红线则为异常,那么显示上回的建议价
BigDecimal suggestLowPrice = storageMap.get(csc.getSku()).getSuggestLowPrice();
BigDecimal suggestHighPrice = storageMap.get(csc.getSku()).getSuggestHighPrice();
BigDecimal suggestLowPrice = null == storageMap.get(csc.getSku()) ? null : storageMap.get(csc.getSku()).getSuggestLowPrice();
BigDecimal suggestHighPrice = null == storageMap.get(csc.getSku()) ? null : storageMap.get(csc.getSku()).getSuggestHighPrice();
if(null != suggestLowPrice && null != suggestHighPrice) {
bo.setSuggestPriceRange(getFormatPrice(suggestLowPrice) + "~" + getFormatPrice(suggestHighPrice));
}
bo.setStatus(csc.getStatus());
bo.setStatusStr(bo.getStatus().intValue()==CHANNEL_SKU_COMPARE_NORMAL ? "正常" : "异常");
String imageUrl = goodsIdImageMap.get(storageMap.get(csc.getSku()).getGoodsId());
bo.setImageUrl(ImagesHelper.getImageAbsoluteUrl(imageUrl, ImagesConstant.BUCKET_GOODS_IMG));
if(null != storageMap.get(csc.getSku())) {
String imageUrl = goodsIdImageMap.get(storageMap.get(csc.getSku()).getGoodsId());
bo.setImageUrl(ImagesHelper.getImageAbsoluteUrl(imageUrl, ImagesConstant.BUCKET_GOODS_IMG));
}
boList.add(bo);
}
... ...