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

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

@@ -448,7 +448,7 @@ public class CalculationServiceImpl {
         }
 
         //加料
-        if (cartGoods != null && (null != cartGoods.getProductMaterialList() || cartGoods.getProductMaterialList().size()>0)) {
+        if (null != cartGoods && CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(1);