Commit e4de5dda by shuhu.hou@freemud.cn

获取优惠券:修改套餐价格为: 套餐价+可选商品总价格

parent ce952839
...@@ -519,14 +519,13 @@ public class CouponServiceImpl implements CouponService { ...@@ -519,14 +519,13 @@ public class CouponServiceImpl implements CouponService {
} }
Product product = new Product(); Product product = new Product();
product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId()); product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId());
// 商品价格 // 普通商品价格
product.setAmount(Integer.valueOf(cartGood.getOriginalPrice() + "")); product.setAmount(Integer.valueOf(cartGood.getOriginalPrice() + ""));
//剔除套餐的商品 // 套餐价格为: 套餐价+可选商品总价格
if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGood.getGoodsType())) { if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGood.getGoodsType())) {
Long finalPrice = cartGood.getFinalPrice(); Long finalPrice = cartGood.getFinalPrice();
if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())){ if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())){
finalPrice+=cartGood.getProductGroupList().stream().mapToLong(group->group.getAmount()*group.getQty()).sum(); finalPrice+=cartGood.getProductGroupList().stream().mapToLong(group->group.getFinalPrice()*group.getQty()).sum();
} }
product.setAmount(finalPrice.intValue()); product.setAmount(finalPrice.intValue());
} }
......
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