Authored by chenjian

Merge branch 'dev-offline-buy' into test6.8.5

... ... @@ -781,9 +781,11 @@ public class ProductServiceImpl implements ProductService{
Product product = productMapper.selectByPrimaryKey(skupDo.getProductId());
Goods goods = goodsMapper.selectByPrimaryKey(skupDo.getGoodsId());
Storage storage = storageMapper.selectByPrimaryKey(skupDo.getStorageId());
List<GoodsImages> goodsImages = goodsImagesMapper.selectByGoodsId(skupDo.getGoodsId());
Goods goods = goodsMapper.selectByPrimaryKey(storage.getGoodsId());
List<GoodsImages> goodsImages = goodsImagesMapper.selectByGoodsId(goods.getId());
List<String> imageList = CollectionUtils.isEmpty(goodsImages) ? Lists.newArrayList()
: goodsImages.stream().map(GoodsImages::getImageUrl).filter(StringUtils::isNotBlank).collect(Collectors.toList());
... ...