diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java index 02eb5703..1eb51582 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java +++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java @@ -133,6 +133,13 @@ public class PromotionTools { promotionGoods.setStoreName(promotion.getStoreName()); } promotionGoods.setTitle(promotion.getPromotionName()); + // 如果是秒杀活动保留原时间 + if (promotionGoods.getStartTime() == null || !PromotionTypeEnum.SECKILL.equals(promotionTypeEnum)) { + promotionGoods.setStartTime(promotion.getStartTime()); + } + if (promotionGoods.getStartTime() == null || !PromotionTypeEnum.SECKILL.equals(promotionTypeEnum)) { + promotionGoods.setEndTime(promotion.getEndTime()); + } promotionGoods.setStartTime(promotion.getStartTime()); promotionGoods.setEndTime(promotion.getEndTime()); promotionGoods.setPromotionType(promotionTypeEnum.name());