Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of…

Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -83,7 +83,7 @@ public class MemberDiscountServiceImpl implements IPromotionService {
             if (!CollectionUtils.isEmpty(goods.getDiscounts())) {
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount : goods.getDiscounts()) {
                     if (ActivityTypeEnum.TYPE_27.getCode().equals(goodsDiscount.getType())) {
-                        result.putIfAbsent(goods.getCartGoodsUid(), goodsDiscount.getDiscount() * goodsDiscount.getActualGoodsNumber());
+                        result.putIfAbsent(goods.getCartGoodsUid(), goodsDiscount.getDiscount());
                     }
                 }
             }