Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre

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

@@ -1113,6 +1113,9 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
 
         //买券包调促销指定只计算限时特价    [2,21,29]  29.商品限购
         calculationDiscountRequestDto.setActivityTypes(Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_29.getCode()));
+        if (Objects.nonNull(createOrderRequest.getEnableSharing()) && createOrderRequest.getEnableSharing().compareTo(0) == 0) {
+            calculationDiscountRequestDto.setActivityTypes(Arrays.asList(ActivityTypeEnum.TYPE_29.getCode()));
+        }
         calculationDiscountRequestDto.setVer(1);
         calculationDiscountRequestDto.setApplication("isaas");
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto = promotionDiscountClient.calculationDiscountSharing(calculationDiscountRequestDto);