代金券增加小料金额

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

@@ -540,15 +540,20 @@ public class CouponServiceImpl implements CouponService {
             // 套餐价格为： 套餐价+可选商品总价格
             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.getFinalPrice()*group.getQty()).sum();
+                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
+                    finalPrice += cartGood.getProductGroupList().stream().mapToLong(group -> group.getFinalPrice() * group.getQty()).sum();
                 }
                 product.setAmount(finalPrice.intValue());
             }
             // 数量
             product.setQuantity(cartGood.getQty());
             productList.add(product);
-            totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
+            totalAmount = totalAmount + product.getAmount() * cartGood.getQty();
+            if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
+                for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
+                    totalAmount = totalAmount + materialGoods.getAmount();
+                }
+            }
         }
         return totalAmount;
     }