老版促销增加小料数量入参

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

@@ -58,8 +58,8 @@ public class MaterialPromotionService implements IPromotionService {
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 //materialAmount += materialGoods.getFinalPrice()*cartGoods.getQty();
                 //materialOriginal += materialGoods.getOriginalPrice() * cartGoods.getQty();
-                materialGoods.setAmount(materialGoods.getFinalPrice() * cartGoods.getQty());
-                materialGoods.setOriginalAmount(materialGoods.getOriginalPrice() * cartGoods.getQty());
+                materialGoods.setAmount(materialGoods.getFinalPrice() * materialGoods.getQty());
+                materialGoods.setOriginalAmount(materialGoods.getOriginalPrice() * materialGoods.getQty());
             }
             //设置商品行现总价\行原价 商品总价+小料商品总价
             //cartGoods.setAmount(cartGoods.getAmount() + materialAmount);

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

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