From 09af55fde14a7d5698a7b97019b8dd74d99063e7 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 26 Aug 2021 15:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=B4=BB=E5=8A=A8=E5=B1=95=E7=A4=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/serviceimpl/SeckillApplyServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index 67fa5c72..54c82091 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -303,9 +303,8 @@ public class SeckillApplyServiceImpl extends ServiceImpl hoursSored[i] && hour <= hoursSored[i + 1]) { - timeLine = cn.lili.common.utils.DateUtil.getDateline(date + " " + hoursSored[i + 1], "yyyy-MM-dd HH"); - } + + Long distanceTime = timeLine - currentTime < 0 ? 0 : timeLine - currentTime; tempTimeline.setDistanceStartTime(distanceTime); tempTimeline.setStartTime(timeLine);