Merge branch 'feature/20191119_套餐特价' into develop

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

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