Merge branch '20210817-满M件N折活动支持-zhiwei.zha' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

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

@@ -133,12 +133,6 @@ public class CalculationCommonService {
         cartGoods.setAmount(find.getRealAmount());
         cartGoods.setCurrentCouponDiscount(0);
         cartGoods.setFinalPrice(find.getNowPrice());
-        // fix 免单情况，C端展示问题
-        int activityNumber = 0;
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : find.getDiscounts()) {
-            activityNumber += discount.getActualGoodsNumber();
-        }
-        cartGoods.setActivityNumber(activityNumber);
         if (CollectionUtils.isNotEmpty(find.getDiscounts())){
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = find.getDiscounts().stream()
                     .filter(p -> p.getActivityCode().equals(couponCode)).findFirst().orElse(null);