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

@@ -545,20 +545,17 @@ public class CouponServiceImpl implements CouponService {
                 }
                 product.setAmount(finalPrice.intValue());
             }
-            // 数量
-            product.setQuantity(cartGood.getQty());
-            productList.add(product);
+
             totalAmount = totalAmount + product.getAmount() * cartGood.getQty();
             if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
                 for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
-                    Product mProduct = new Product();
-                    mProduct.setProductId(materialGoods.getSpuId());
-                    mProduct.setAmount(Integer.valueOf(materialGoods.getOriginalPrice() + ""));
-                    mProduct.setQuantity(cartGood.getQty());
+                    product.setAmount(product.getAmount() + Integer.valueOf(materialGoods.getOriginalPrice() + ""));
                     totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
-                    productList.add(mProduct);
                 }
             }
+            // 数量
+            product.setQuantity(cartGood.getQty());
+            productList.add(product);
         }
         return totalAmount;
     }