Merge branch 'ww' into test
This commit is contained in:
commit
31b20a92fd
|
|
@ -254,7 +254,7 @@ public class TbProductServiceImpl implements TbProductService {
|
||||||
BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();
|
BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();
|
||||||
productNewVo.setLowPrice(productNewVo.getLowPrice() + "~¥" + maxPrice);
|
productNewVo.setLowPrice(productNewVo.getLowPrice() + "~¥" + maxPrice);
|
||||||
}
|
}
|
||||||
if(!product.getTypeEnum().equals("sku")){
|
if(product.getTypeEnum().equals("sku")){
|
||||||
//规格填充
|
//规格填充
|
||||||
productNewVo.setSkuList(convert(tbProductSkus));
|
productNewVo.setSkuList(convert(tbProductSkus));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue