From 49603e29bd373ca2334abeb758257069f1474a0e Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 22 Jun 2022 15:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E6=9C=89?=
 =?UTF-8?q?=E5=8F=82=E5=8A=A0=E5=95=86=E5=93=81=E7=9A=84=E4=BF=83=E9=94=80?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=97=B6=E9=97=B4=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=97=B6=E9=97=B4=E6=B2=A1=E6=9C=89=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lili/modules/promotion/tools/PromotionTools.java    | 7 +++++++
 1 file changed, 7 insertions(+)

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());