Commit 1379fa73 by 孙昱

sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price

parent 57181980
...@@ -511,8 +511,8 @@ public class ShoppingCartConvertAdapter { ...@@ -511,8 +511,8 @@ public class ShoppingCartConvertAdapter {
if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){ if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
int price = int price =
(null == cartGoods.getProductGroupList() ? 0 : (null == cartGoods.getProductGroupList() ? 0 :
cartGoods.getProductGroupList().stream().mapToInt(t -> (null == t.getFinalPrice() ? 0 : t.getFinalPrice().intValue()) * t.getQty()).sum()) cartGoods.getProductGroupList().stream().mapToInt(t -> (null == t.getOriginalPrice() ? 0 : t.getOriginalPrice().intValue()) * t.getQty()).sum())
+ cartGoods.getFinalPrice().intValue(); + cartGoods.getOriginalPrice().intValue();
productType.setPrice(price); productType.setPrice(price);
}else{ }else{
productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue()); productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());
...@@ -873,7 +873,7 @@ public class ShoppingCartConvertAdapter { ...@@ -873,7 +873,7 @@ public class ShoppingCartConvertAdapter {
comboxGoodsOriginalPrice); comboxGoodsOriginalPrice);
cartGoods.setOriginalAmount((cartGoods.getOriginalPrice()+groupGoodsOriginalPrice)* cartGoods.getQty()); cartGoods.setOriginalAmount((cartGoods.getOriginalPrice()+groupGoodsOriginalPrice)* cartGoods.getQty());
//咨询商品服务,套餐售价取originalPrice //咨询商品服务,套餐售价取originalPrice
cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() : cartGoods.setFinalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
comboxGoodsFinalPrice); comboxGoodsFinalPrice);
cartGoods.setAmount((cartGoods.getFinalPrice()+groupGoodsFinalPrice) * cartGoods.getQty()); cartGoods.setAmount((cartGoods.getFinalPrice()+groupGoodsFinalPrice) * cartGoods.getQty());
} else { } else {
...@@ -882,7 +882,7 @@ public class ShoppingCartConvertAdapter { ...@@ -882,7 +882,7 @@ public class ShoppingCartConvertAdapter {
cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty()); cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty()); cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
//咨询商品服务,套餐售价取originalPrice //咨询商品服务,套餐售价取originalPrice
cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice()); cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getOriginalPrice() : spuProduct.getFinalPrice());
} }
cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight()); cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit()); cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());
......
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