Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa

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

@@ -551,7 +551,11 @@ public class CouponServiceImpl implements CouponService {
             totalAmount = totalAmount + product.getAmount() * cartGood.getQty();
             if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
                 for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
-                    totalAmount = totalAmount + materialGoods.getAmount();
+                    Product mProduct = new Product();
+                    mProduct.setProductId(materialGoods.getSpuId());
+                    mProduct.setAmount(Integer.valueOf(materialGoods.getOriginalPrice() + ""));
+                    totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
+                    productList.add(mProduct);
                 }
             }
         }