新增卡券类型字段

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -158,6 +158,10 @@ public class ActivityCalculationDiscountResponseDto {
              * 运费月卡入机字段
              */
             private String tenderId;
+            /**
+             *  1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+             */
+            private Integer extendType;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java

@@ -25,6 +25,10 @@ public class ActivityDiscountsDto {
      * 运费月卡入机字段
      */
     private String tenderId;
+    /**
+     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+     */
+    private Integer extendType;
 
     /**
      * 实际参与活动商品数量

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

@@ -194,6 +194,7 @@ public class CalculationServiceImpl {
                 activityDiscountsDto.setActivityType(discountType);
                 activityDiscountsDto.setDiscountAmount(0 - discountAmount);
                 activityDiscountsDto.setTenderId(discount.getTenderId());
+                activityDiscountsDto.setExtendType(discount.getExtendType());
                 activityDiscountsDtos.add(activityDiscountsDto);
             }
         }