Merge branch 'feature/20210617-集点活动改造-张志恒'

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

@@ -241,6 +241,7 @@ public class    BaseCreateOrderRequest extends BaseConfig {
         private Integer maxNum;
         private Integer validityDateDays;
         private Boolean storeLevel;
+        private Integer isContinueExchange;
 
     }
 

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

@@ -360,6 +360,7 @@ public class ShoppingCartGoodsDto {
         private Integer maxNum;
         private Integer validityDateDays;
         private Boolean storeLevel;
+        private Integer isContinueExchange;
 
     }
 

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

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

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -683,6 +683,7 @@ public abstract class UniversalOrderService {
             orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
             orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
+            orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
         }
 
         return orderExtInfoDto;

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

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

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/CalculationDiscountBO.java

@@ -171,6 +171,7 @@ public class CalculationDiscountBO {
             private Integer validityDateDays;
             private Date endTime;
             private Boolean storeLevel;
+            private Integer isContinueExchange;
         }
 
         @Data

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

@@ -584,6 +584,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
             sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
+            sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
             return sendPointNew;
         }
         return null;

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

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

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

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

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

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

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

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

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

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