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

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

@@ -316,7 +316,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

@@ -2897,6 +2897,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

@@ -184,6 +184,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/shoppingCart/SendPoint.java

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