Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -90,6 +90,11 @@ public class CartGoods {
      * 购物车一行商品的数量
      */
     private Integer qty;
+
+    /**
+     * 参与活动商品数量 前端展示参数
+     */
+    private Integer activityNumber;
     /**
      * 购物车一行商品的名称
      */

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -70,6 +70,7 @@ public class TimeSaleCalculation {
             if(discounts.contains(ActivityTypeEnum.TYPE_2.getCode()) || discounts.contains(ActivityTypeEnum.TYPE_21.getCode())){
                 cartGoods.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
             }
+            cartGoods.setActivityNumber(goodsDiscount.getActualGoodsNumber());
             // 享受限时特价折扣的商品数量
             Integer specialActualGoodsNumber = null;
             // 商品现价