diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts
index fff7c63fc..02102a2f8 100644
--- a/game-server/app/servers/activity/handler/activityHandler.ts
+++ b/game-server/app/servers/activity/handler/activityHandler.ts
@@ -32,79 +32,88 @@ export class ActivityHandler {
     * @memberof ActivityHandler
     */
     async getAllOpenActivity(msg: { hid: number, lv: number }, session: BackendSession) {
-        const { hid, lv } = msg;
+        const { } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
+        let test = true;
         let playerActivityArray = [];
         //七天乐活动-成长任务 1 2 3
         {
-            let sevenData = [];
-            let growthData = await growthActivity(serverId, roleId);
-            if (growthData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.TASK_GROWTH,
-                    activityId: growthData.activityId,
-                    data: growthData,
-                });
-            }
-            let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
-            if (dailyChallengesData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
-                    activityId: dailyChallengesData.activityId,
-                    data: dailyChallengesData,
-                });
-            }
-            let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
-            if (dailyGiftsData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
-                    activityId: dailyGiftsData.activityId,
-                    data: dailyGiftsData,
-                });
-            }
-            if (sevenData.length > 0) {
-                playerActivityArray.push({
-                    type: ACTIVITY_TYPE.SEVEN_DAY,
-                    activityId: 0,
-                    data: sevenData,
-                });
+            let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
+            if (new Date() < endTime || test) {//开启中，开服7天后过期
+                let sevenData = [];
+                let growthData = await growthActivity(serverId, roleId);
+                if (growthData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.TASK_GROWTH,
+                        activityId: growthData.activityId,
+                        data: growthData,
+                    });
+                }
+                let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
+                if (dailyChallengesData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
+                        activityId: dailyChallengesData.activityId,
+                        data: dailyChallengesData,
+                    });
+                }
+                let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
+                if (dailyGiftsData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
+                        activityId: dailyGiftsData.activityId,
+                        data: dailyGiftsData,
+                    });
+                }
+                if (sevenData.length > 0) {
+                    playerActivityArray.push({
+                        type: ACTIVITY_TYPE.SEVEN_DAY,
+                        activityId: 0,
+                        data: sevenData,
+                    });
+                }
             }
         }
         //14天乐活动-成长任务 1 2 3
         {
-            let sevenData = [];
-            let growthData = await growthActivity(serverId, roleId);
-            if (growthData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.TASK_GROWTH,
-                    activityId: growthData.activityId,
-                    data: growthData,
-                });
-            }
-            let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
-            if (dailyChallengesData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
-                    activityId: dailyChallengesData.activityId,
-                    data: dailyChallengesData,
-                });
-            }
-            let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
-            if (dailyGiftsData) {
-                sevenData.push({
-                    type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
-                    activityId: dailyGiftsData.activityId,
-                    data: dailyGiftsData,
-                });
-            }
-            if (sevenData.length > 0) {
-                playerActivityArray.push({
-                    type: ACTIVITY_TYPE.FOURTEEN_DAY,
-                    activityId: 0,
-                    data: sevenData,
-                });
+            let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
+            let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
+            let curDate = new Date()
+            if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束
+                let sevenData = [];
+                let growthData = await growthActivity(serverId, roleId);
+                if (growthData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.TASK_GROWTH,
+                        activityId: growthData.activityId,
+                        data: growthData,
+                    });
+                }
+                let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
+                if (dailyChallengesData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
+                        activityId: dailyChallengesData.activityId,
+                        data: dailyChallengesData,
+                    });
+                }
+                let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
+                if (dailyGiftsData) {
+                    sevenData.push({
+                        type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
+                        activityId: dailyGiftsData.activityId,
+                        data: dailyGiftsData,
+                    });
+                }
+                if (sevenData.length > 0) {
+                    playerActivityArray.push({
+                        type: ACTIVITY_TYPE.FOURTEEN_DAY,
+                        activityId: 0,
+                        data: sevenData,
+                    });
+                }
             }
         }
         //签到 4