Commit 5e2b72a7 by zhangzhiheng

集点活动改造

parent b4e00174
...@@ -234,6 +234,7 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -234,6 +234,7 @@ public class BaseCreateOrderRequest extends BaseConfig {
private Integer maxNum; private Integer maxNum;
private Integer validityDateDays; private Integer validityDateDays;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
......
...@@ -342,6 +342,7 @@ public class ShoppingCartGoodsDto { ...@@ -342,6 +342,7 @@ public class ShoppingCartGoodsDto {
private Integer maxNum; private Integer maxNum;
private Integer validityDateDays; private Integer validityDateDays;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
......
...@@ -2977,6 +2977,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2977,6 +2977,7 @@ public class OrderServiceImpl implements Orderservice {
orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + ""); orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint()); orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel()); orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
} }
return orderExtInfoDto; return orderExtInfoDto;
} }
......
...@@ -683,6 +683,7 @@ public abstract class UniversalOrderService { ...@@ -683,6 +683,7 @@ public abstract class UniversalOrderService {
orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + ""); orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint()); orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel()); orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
} }
return orderExtInfoDto; return orderExtInfoDto;
......
...@@ -183,6 +183,7 @@ public class OrderExtInfoDto { ...@@ -183,6 +183,7 @@ public class OrderExtInfoDto {
private Integer sendPointMaxNum; private Integer sendPointMaxNum;
private Integer sendPointValidityDateDays; private Integer sendPointValidityDateDays;
private Boolean sendPointStoreLevel; private Boolean sendPointStoreLevel;
private Integer isContinueExchange;
/** /**
* 唤起预支付设备号 * 唤起预支付设备号
......
...@@ -171,6 +171,7 @@ public class CalculationDiscountBO { ...@@ -171,6 +171,7 @@ public class CalculationDiscountBO {
private Integer validityDateDays; private Integer validityDateDays;
private Date endTime; private Date endTime;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
@Data @Data
......
...@@ -584,6 +584,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe ...@@ -584,6 +584,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
sendPointNew.setActivityCode(discountDTO.getActivityCode()); sendPointNew.setActivityCode(discountDTO.getActivityCode());
sendPointNew.setEndTime(discountDTO.getEndTime()); sendPointNew.setEndTime(discountDTO.getEndTime());
sendPointNew.setStoreLevel(sendPointVo.getStoreLevel()); sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
return sendPointNew; return sendPointNew;
} }
return null; return null;
......
...@@ -242,6 +242,7 @@ public class ActivityCalculationDiscountResponseDto { ...@@ -242,6 +242,7 @@ public class ActivityCalculationDiscountResponseDto {
private Integer exchangeNum; private Integer exchangeNum;
private Integer validityDateDays; private Integer validityDateDays;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
@Data @Data
......
...@@ -185,6 +185,7 @@ public class CalculationSharingDiscountResponseDto { ...@@ -185,6 +185,7 @@ public class CalculationSharingDiscountResponseDto {
private Integer validityDateDays; private Integer validityDateDays;
private Date endTime; private Date endTime;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
@Data @Data
......
...@@ -13,5 +13,6 @@ public class SendPoint { ...@@ -13,5 +13,6 @@ public class SendPoint {
private Integer maxNum; private Integer maxNum;
private Integer validityDateDays; private Integer validityDateDays;
private Boolean storeLevel; private Boolean storeLevel;
private Integer isContinueExchange;
} }
...@@ -1465,6 +1465,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1465,6 +1465,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
sendPointNew.setActivityCode(discountDTO.getActivityCode()); sendPointNew.setActivityCode(discountDTO.getActivityCode());
sendPointNew.setEndTime(discountDTO.getEndTime()); sendPointNew.setEndTime(discountDTO.getEndTime());
sendPointNew.setStoreLevel(sendPointVo.getStoreLevel()); sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
result.setSendPointVo(sendPointNew); result.setSendPointVo(sendPointNew);
} }
......
...@@ -248,6 +248,7 @@ public class CalculationSharingDiscountService { ...@@ -248,6 +248,7 @@ public class CalculationSharingDiscountService {
sendPointNew.setActivityCode(discountDTO.getActivityCode()); sendPointNew.setActivityCode(discountDTO.getActivityCode());
sendPointNew.setEndTime(discountDTO.getEndTime()); sendPointNew.setEndTime(discountDTO.getEndTime());
sendPointNew.setStoreLevel(sendPointVo.getStoreLevel()); sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
result.setSendPointVo(sendPointNew); result.setSendPointVo(sendPointNew);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment