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

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

@@ -420,15 +420,28 @@ public class CalculationServiceImpl {
                 if("0".equals(materialGoods.getGoodsId())){
                     continue;
                 }
-                ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
-                material.setType(2);
-                material.setGoodsId(materialGoods.getGoodsId());
-                material.setGoodsQuantity(materialGoods.getQty());
-                material.setOriginalPrice(null != materialGoods.getFinalPrice() ?
+                ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material productGroup =
+                        new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
+                productGroup.setType(2);
+                productGroup.setGoodsId(materialGoods.getGoodsId());
+                productGroup.setGoodsQuantity(materialGoods.getQty());
+                productGroup.setOriginalPrice(null != materialGoods.getFinalPrice() ?
                         materialGoods.getFinalPrice() : 0);
+                materials.add(productGroup);
+
+                if (CollectionUtils.isNotEmpty(materialGoods.getProductMaterialList())){
+                    for (CartGoods.MaterialGoods goods : materialGoods.getProductMaterialList()) {
+                        ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
+                        material.setType(1);
+                        material.setGoodsId(goods.getSpuId());
+                        material.setGoodsQuantity(1);
+                        material.setOriginalPrice(null != goods.getFinalPrice() ?
+                                goods.getFinalPrice() : 0);
                         materials.add(material);
                     }
                 }
+            }
+        }
 
         //固定商品
         if (cartGoods != null && CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {