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

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -116,6 +116,8 @@ public class ActivityCalculationDiscountRequestDto {
          * 加料/套餐可选商品
          */
         private List<Material> smallMaterial;
+        private String spuId;
+
         @Override
         public boolean equals(Object o) {
             if (this == o)
@@ -155,5 +157,4 @@ public class ActivityCalculationDiscountRequestDto {
             private int type;
         }
     }
-
 }

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

@@ -849,6 +849,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         calculationDiscountGoods.setGoodsQuantity(cartGoods.getQty());
         calculationDiscountGoods.setOriginalPrice(cartGoods.getFinalPrice());
         calculationDiscountGoods.setMemberDiscount(cartGoods.getMemberDiscount());
+        calculationDiscountGoods.setSpuId(cartGoods.getSpuId());
 
         //加料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {