- 小料数量固定传1

- 券码透传金额包含小料
- 均摊*主商品金额

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

@@ -548,12 +548,12 @@ public class CouponServiceImpl implements CouponService {
 
             totalAmount = totalAmount + product.getAmount() * cartGood.getQty();
             // todo ：小料价格累加到主商品上
-            //if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
-            //    for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
-            //        product.setAmount(product.getAmount() + Integer.valueOf(materialGoods.getOriginalPrice() + ""));
-            //        totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
-            //    }
-            //}
+            if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
+                for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
+                    product.setAmount(product.getAmount() + Integer.valueOf(materialGoods.getOriginalPrice() + ""));
+                    totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
+                }
+            }
             // 数量
             product.setQuantity(cartGood.getQty());
             productList.add(product);

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

@@ -111,7 +111,7 @@ public class MaterialPromotionService implements IPromotionService {
             for (ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods materialGoods : product.getMaterialList()) {
                 product.setSalePrice(product.getSalePrice() + materialGoods.getSalePrice());//现金
                 product.setOriginalPrice(product.getOriginalPrice() + materialGoods.getOriginalPrice());
-                product.setTotalDiscountAmount(product.getTotalDiscountAmount() + materialGoods.getTotalDiscountAmount());
+                product.setTotalDiscountAmount(product.getTotalDiscountAmount() + materialGoods.getTotalDiscountAmount() * product.getQty());
                 product.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());
             }
         }

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

@@ -858,7 +858,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(1);
                 material.setGoodsId(materialGoods.getSpuId());
-                material.setGoodsQuantity(cartGoods.getQty());
+                material.setGoodsQuantity(1);
                 material.setOriginalPrice(materialGoods.getFinalPrice());
                 materials.add(material);
             }