Commit 950ed570 by 孙昱

sunyu::update::!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId())

parent 4e91346d
...@@ -1974,10 +1974,12 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1974,10 +1974,12 @@ public class ShoppingCartMCoffeeServiceImpl {
//如果购物车中存在月享卡,则将商品返回的卡券信息替换购物车中的卡券信息 //如果购物车中存在月享卡,则将商品返回的卡券信息替换购物车中的卡券信息
replaceMonthCardInfo(valiadShopProductResult,cartGoods); replaceMonthCardInfo(valiadShopProductResult,cartGoods);
ProductTypeBeanDTO productType = valiadShopProductResult.getProductType(); ProductTypeBeanDTO productType = valiadShopProductResult.getProductType();
if(!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId()) && ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){ if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
//多规格商品更新套餐价格为商品返回 //多规格商品更新套餐价格为商品返回
if(!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId())) {
cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice()); cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice()); cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
}
Map<String,ProductTypeBeanDTO> subProductTypeMap = valiadShopProductResult.getSubProductTypeMap(); Map<String,ProductTypeBeanDTO> subProductTypeMap = valiadShopProductResult.getSubProductTypeMap();
shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, productType,subProductTypeMap); shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, productType,subProductTypeMap);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment