Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -425,6 +425,9 @@ public class CartGoods {
         if (CollectionUtils.isNotEmpty(productGroupList)) {
             for (ComboxGoods goods : productGroupList) {
                 originalString.append(goods.toString());
+                if (CollectionUtils.isNotEmpty(goods.getProductMaterialList())) {
+                    goods.getProductMaterialList().stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> originalString.append(e.getSpuId()));
+                }
             }
         }
         if (CollectionUtils.isNotEmpty(productMaterialList)) {