Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -1743,8 +1743,16 @@ public class ShoppingCartMCoffeeServiceImpl {
                     ProductTypeBeanDTO productType = valiadShopProductResult.getProductType();
                     if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
                         //多规格商品更新套餐价格为商品返回
-                        List<String> requestCheckSkuList = validateShopProductRequest.getProductTypeList().stream().map(pro ->
-                                CollectionUtils.isNotEmpty(pro.getComboProductTypeList()) ? pro.getComboProductTypeList().stream().map(comboPro -> comboPro.getSkuId()).toString():null).collect(Collectors.toList());
+                        List<String> requestCheckSkuList = new ArrayList<>();
+                        if(CollectionUtils.isNotEmpty(validateShopProductRequest.getProductTypeList())){
+                            for (ValidateShopProductType validateShopProductType : validateShopProductRequest.getProductTypeList()) {
+                                if (CollectionUtils.isNotEmpty(validateShopProductType.getComboProductTypeList())){
+                                    for (ValidateSkuProductType validateSkuProductType : validateShopProductType.getComboProductTypeList()) {
+                                        requestCheckSkuList.add(validateSkuProductType.getSkuId());
+                                    }
+                                }
+                            }
+                        }
                         List<String> cartSkuIdList = CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) ?  cartGoods.getProductComboList().stream().map(cartGood-> cartGood.getSkuId()).collect(Collectors.toList()) : null;
                         log.info("requestCheckSkuList:{} ,cartSkuList: {}",requestCheckSkuList,cartSkuIdList);
                         if (requestCheckSkuList.containsAll(cartSkuIdList)){