Merge remote-tracking branch 'origin/qa' into qa

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

@@ -76,7 +76,7 @@ public class SetMealCalculation {
                     Long comboxmaterialPrice = 0L;
                     if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
                         for (CartGoods.MaterialGoods materialGoods : comboxGoods.getProductMaterialList()){
-                            comboxmaterialPrice+= materialGoods.getFinalPrice() * cartGoods.getQty();
+                            comboxmaterialPrice+= null !=  materialGoods.getFinalPrice() ? materialGoods.getFinalPrice() * cartGoods.getQty() : 0;
                         }
                     }
                     comboxGoods.setAmount(comboxGoods.getAmount()+comboxmaterialPrice);