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

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

@@ -9,10 +9,7 @@ import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
-import cn.freemud.entities.dto.product.ProductTypeBeanDTO;
-import cn.freemud.entities.dto.product.ValiadShopProductResponse;
-import cn.freemud.entities.dto.product.ValiadShopProductResult;
-import cn.freemud.entities.dto.product.ValidateShopProductRequest;
+import cn.freemud.entities.dto.product.*;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.vo.*;
@@ -1746,8 +1743,14 @@ public class ShoppingCartMCoffeeServiceImpl {
                     ProductTypeBeanDTO productType = valiadShopProductResult.getProductType();
                     if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
                         //多规格商品更新套餐价格为商品返回
-                        cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
-                        cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                        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> 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)){
+                            cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                            cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                        }
                         Map<String,ProductTypeBeanDTO> subProductTypeMap = valiadShopProductResult.getSubProductTypeMap();
                         shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, productType,subProductTypeMap);
                         break;