Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -35,6 +35,7 @@ public enum ActivityTypeEnum {
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
     TYPE_33(33, "换购券"),
+    TYPE_34(34, "配送券"),
     TYPE_37(37, "月享卡种子券"),
     TYPE_35(35, "买3赠1券"),
     TYPE_38(38,"月享卡2.0"),

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

@@ -7,6 +7,7 @@ import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
+import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.CouponFlag;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.CouponService;
@@ -212,6 +213,16 @@ public class CouponPromotionService implements IPromotionService {
         }
         // fisherman 获取优惠券的信息 存放入 setActivityDiscountsDtos
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
+            if (ActivityTypeEnum.TYPE_34.getCode().compareTo(couponDiscount.getActivityType()) ==0) {
+                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                activityDiscountsDto.setActivityCode(null);
+                activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
+                activityDiscountsDto.setActivityType(couponDiscount.getActivityType());
+                activityDiscountsDto.setDiscountAmount(couponDiscount.getDiscountAmount());
+                activityDiscountsDto.setExtendType(couponDiscount.getActivityType());
+                activityDiscountsDtos.add(activityDiscountsDto);
+                continue;
+            }
             ActivityDiscountsDto activityDiscountsDto = getActivityDiscountDto(calculationDiscountResult.getApportionGoods(), couponDiscount);
             if (activityDiscountsDto != null) {
                 activityDiscountsDtos.add(activityDiscountsDto);