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

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

@@ -420,7 +420,8 @@ public class CalculationServiceImpl {
                 material.setType(2);
                 material.setGoodsId(materialGoods.getGoodsId());
                 material.setGoodsQuantity(materialGoods.getQty());
-                material.setOriginalPrice(materialGoods.getFinalPrice());
+                material.setOriginalPrice(null != materialGoods.getFinalPrice() ?
+                        materialGoods.getFinalPrice() : 0);
                 materials.add(material);
             }
         }
@@ -438,7 +439,8 @@ public class CalculationServiceImpl {
                         material.setType(1);
                         material.setGoodsId(materialGoods2.getSpuId());
                         material.setGoodsQuantity(1);
-                        material.setOriginalPrice(materialGoods2.getFinalPrice());
+                        material.setOriginalPrice(null != materialGoods2.getFinalPrice() ?
+                                materialGoods2.getFinalPrice() : 0);
                         materials.add(material);
                     }
                 }
@@ -452,7 +454,8 @@ public class CalculationServiceImpl {
                 material.setType(1);
                 material.setGoodsId(materialGoods.getSpuId());
                 material.setGoodsQuantity(1);
-                material.setOriginalPrice(materialGoods.getOriginalPrice());
+                material.setOriginalPrice(null != materialGoods.getOriginalPrice() ?
+                        materialGoods.getOriginalPrice() : 0);
                 material.setNowPrice(materialGoods.getFinalPrice().intValue());
                 materials.add(material);
             }