Merge branch 'feature/20201211-集点改造活动三期-张志恒' into qa

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

@@ -194,6 +194,7 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer maxNum;
             private Integer exchangeNum;
             private Integer validityDateDays;
+            private Boolean storeLevel;
         }
 
         @Data

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

@@ -169,6 +169,7 @@ public class CalculationSharingDiscountResponseDto {
             private Integer exchangeNum;
             private Integer validityDateDays;
             private Date endTime;
+            private Boolean storeLevel;
         }
 
         @Data

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

@@ -1091,6 +1091,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             sendPointNew.setValidityDateDays(sendPointVo.getValidityDateDays());
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
+            sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
             result.setSendPointVo(sendPointNew);
         }
 

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

@@ -219,6 +219,7 @@ public class CalculationSharingDiscountService {
             sendPointNew.setValidityDateDays(sendPointVo.getValidityDateDays());
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
+            sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
             result.setSendPointVo(sendPointNew);
         }