Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -289,7 +289,7 @@ public class ShoppingCartConvertAdapter {
                     ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
                     goods.setSpuId(materialGoods.getSpuId());
                     goods.setSpuName(materialGoods.getSpuName());
-                    goods.setOriginalPrice(materialGoods.getOriginalPrice());
+                    goods.setOriginalPrice(null != materialGoods.getOriginalPrice() ? materialGoods.getOriginalPrice() : 0);
                     goods.setSalePrice(materialGoods.getFinalPrice());
                     goods.setQty(cartGoods.getQty());
                     goods.setTotalDiscountAmount(0);