From 9bdd4163c2acb8e00f973a0afb5eb952c65bb063 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 18 Jan 2024 11:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=B4=BB=E5=8A=A8=EF=BC=8Cti?= =?UTF-8?q?me=E7=B1=BB=E5=9E=8B=E4=B8=BA6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 0da95e38b..0c6138fe4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -393,6 +393,7 @@ public class ActivityLogic implements IEventHandler{ long startTime = ToolsUtil.getTimeLong(startTimeLong, endTimeLong, time, userCreateTime, 1); long endTime = ToolsUtil.getTimeLong(startTimeLong, endTimeLong, time, userCreateTime, 2); + long gepTimeLong = endTime + gapTime * TimeUtils.ONE_DAY; if(type == ActivityType.DAILY_PREFERENTIAL_GIFT){ continue; @@ -434,7 +435,7 @@ public class ActivityLogic implements IEventHandler{ continue; } if (endTime != 0 && now > endTime) { - goRewardActivity(user,activityId,builder,now>endTime+ gapTime *TimeUtils.ONE_DAY); + goRewardActivity(user,activityId,builder,now > gepTimeLong); continue; } boolean checked = checkStateAndInitFromActivity(user, activityId); @@ -449,12 +450,14 @@ public class ActivityLogic implements IEventHandler{ continue; } long creatTime = mission.getCreatTime(); - if (creatTime >= endTimeLong){ + // 活动创建时间在当前开始时间之前,表示开启了新一期活动 + // + if (creatTime < startTimeLong && now > gepTimeLong){ checkStateAndInitFromActivity(user, activityId); } } else { - goRewardActivity(user,activityId,builder,now>endTime + gapTime *TimeUtils.ONE_DAY); + goRewardActivity(user,activityId,builder,now > gepTimeLong); } } return openNewActivityIds;