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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -226,6 +226,7 @@ public class BaseCreateOrderRequest extends BaseConfig {
         private Integer sendPoint;
         private Integer maxNum;
         private Integer validityDateDays;
+        private Boolean storeLevel;
 
     }
     /**

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -322,7 +322,7 @@ public class ShoppingCartGoodsDto {
         private Integer sendPoint;
         private Integer maxNum;
         private Integer validityDateDays;
-
+        private Boolean storeLevel;
 
     }
 

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

@@ -2924,6 +2924,7 @@ public class OrderServiceImpl implements Orderservice {
             orderExtInfoDto.setSendPointActivityCode(sendPoint.getActivityCode());
             orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
+            orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
         }
         return orderExtInfoDto;
     }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -181,6 +181,7 @@ public class OrderExtInfoDto {
     private Integer sendPointSendPoint;
     private Integer sendPointMaxNum;
     private Integer sendPointValidityDateDays;
+    private Boolean sendPointStoreLevel;
 
     /**
      * 唤起预支付设备号

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/entities/dto/shoppingCart/SendPoint.java

@@ -12,5 +12,6 @@ public class SendPoint {
     private Integer sendPoint;
     private Integer maxNum;
     private Integer validityDateDays;
+    private Boolean storeLevel;
 
 }

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

@@ -1242,6 +1242,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);
         }