From 82c102391b6ca3e7bc3c33da840a6f2cc509e88c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 29 Feb 2020 00:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E6=B5=B7=E5=AF=BB=E4=BB=99=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 cd0bd29e8..f0bcf2717 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 @@ -273,7 +273,7 @@ public class ActivityLogic implements IEventHandler{ continue; } if (endTime != 0 && now > endTime) { - goRewardActivity(user,activityId,builder,now>endTime+sGlobalActivity.getGapTime()); + goRewardActivity(user,activityId,builder,now>endTime+sGlobalActivity.getGapTime()*TimeUtils.ONE_DAY); continue; } ActivityMission activityMission = activityMissionMap.get(activityId); @@ -296,7 +296,9 @@ public class ActivityLogic implements IEventHandler{ openNewActivityIds.add(activityId); checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime); } else { - long endTime = sGlobalActivity.getEndTimeLong(); +// long endTime = sGlobalActivity.getEndTimeLong(); + long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),userCreateTime, 2); + goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime()*TimeUtils.ONE_DAY); } }