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

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -456,7 +456,7 @@ public class CalculationServiceImpl {
                 material.setGoodsQuantity(1);
                 material.setOriginalPrice(null != materialGoods.getOriginalPrice() ?
                         materialGoods.getOriginalPrice() : 0);
-                material.setNowPrice(materialGoods.getFinalPrice().intValue());
+                material.setNowPrice(null != materialGoods.getFinalPrice() ? materialGoods.getFinalPrice().intValue():0);
                 materials.add(material);
             }
         }