卖券订单调用促销 新增活动类型

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -27,6 +27,7 @@ public enum ActivityTypeEnum {
     TYPE_21(21, "单品折扣"),
     TYPE_22(22, "单品立减"),
     TYPE_27(27, "会员价优惠"),
+    TYPE_29(29, "商品活动"),
     /**
      * 优惠券
      */

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -1053,8 +1053,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         discountGoodsDtoList.add(discountGoodsDto);
         calculationDiscountRequestDto.setGoods(discountGoodsDtoList);
 
-        //买券包调促销指定只计算限时特价    [2,21]
-        calculationDiscountRequestDto.setActivityTypes(Arrays.asList(2,21));
+        //买券包调促销指定只计算限时特价    [2,21,29]  29.商品限购
+        calculationDiscountRequestDto.setActivityTypes(Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_29.getCode()));
         calculationDiscountRequestDto.setVer(1);
         calculationDiscountRequestDto.setApplication("isaas");
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto = promotionDiscountClient.calculationDiscountSharing(calculationDiscountRequestDto);