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 71bdc22d4..2f726c33c 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 @@ -621,13 +621,14 @@ public class ActivityLogic implements IEventHandler{ startTime = (int)(activityState.getValue().getCreatTime()/1000); endTime = startTime+604800; } -// else if (sGlobalActivity.getTime() == ActivityType.OPEN_TYPE_CYCLE){ -// long now = TimeUtils.now(); -// long cycleTime = sGlobalActivity.getCycleMinute() * TimeUtils.ONE_MINUTE; -// long latelyStarTime = TimeUtils.getLatelyTime(startTime * 1000L, now, cycleTime); -// startTime = (int) (latelyStarTime/1000); -// endTime = (int) ((latelyStarTime + cycleTime + TimeUtils.DAY * gapTime)/1000); -// } + else if (sGlobalActivity.getTime() == ActivityType.OPEN_TYPE_CYCLE){ + long now = TimeUtils.now(); + int intervalTime = endTime - startTime; + long cycleTime = sGlobalActivity.getCycleMinute() * TimeUtils.ONE_MINUTE; + long latelyStarTime = TimeUtils.getLatelyTime(startTime * 1000L, now, cycleTime); + startTime = (int) (latelyStarTime/1000); + endTime = (int) ((latelyStarTime + intervalTime + TimeUtils.DAY * gapTime)/1000); + } else{ endTime = endTime + (int) (TimeUtils.DAY * gapTime / 1000); }