Merge branch 'feature-yu.sun-material-20201030' of…

Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030

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

@@ -686,6 +686,7 @@ public class ShoppingCartConvertAdapter {
         Long finalPrice = isComboxGoods ? productComboType.getFinalPrice().longValue() : groupDetailType.getMarkUpPrice().longValue();
         // 设置商品详情
         Map<String, String> attributes = getAttributesNew(comboxGoods.getExtra());
+        comboxGoods.setSpuId(comboxGoods.getSpuId());
         comboxGoods.setName(isComboxGoods ? productComboType.getProductName() : groupDetailType.getProductName());
         comboxGoods.setSpuName(comboxGoods.getName());
         comboxGoods.setSpecProductId(attributes.get(ATTRIBUTEID));

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

@@ -403,6 +403,9 @@ public class CalculationServiceImpl {
                 //加料
                 if (CollectionUtils.isNotEmpty(materialGoods.getProductMaterialList())) {
                     for (CartGoods.MaterialGoods materialGoods2 : materialGoods.getProductMaterialList()) {
+                        if (StringUtils.isEmpty(materialGoods2.getSpuId())) {
+                            continue;
+                        }
                         ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                         material.setType(1);
                         material.setGoodsId(materialGoods2.getSpuId());