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/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -66,6 +66,10 @@ public class TimeSaleCalculation {
             if (goodsDiscount == null) {
                 continue;
             }
+            // 商品参与限时特价返回，用于前端显示特价标签
+            if(discounts.contains(ActivityTypeEnum.TYPE_2.getCode()) || discounts.contains(ActivityTypeEnum.TYPE_21.getCode())){
+                cartGoods.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
+            }
             // 享受限时特价折扣的商品数量
             Integer specialActualGoodsNumber = null;
             // 商品现价