🎈 perf(活动): 30天任务添加字段，以及过期判断

game-server/app/services/activity/activityService.ts

@@ -50,6 +50,7 @@ import { getGroupShopDataShow } from './groupShopService';
    *
    */
 export async function getActivity(serverId: number, roleId: string, guildCode: string, activityId: number, activityType: number) {
+    try {
     let activityData = null;
     switch (activityType) {
         case ACTIVITY_TYPE.SIGN_IN://签到 4
@@ -72,10 +73,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
             }
         case ACTIVITY_TYPE.THIRTY_DAYS://30天目标活动 12
             {
-                let data = await getPlayerThirtyDaysData(activityId, serverId, roleId);
-                if(data.canShow()) {
-                    activityData = { playerData: data, todayIndex: data.todayIndex }
-                }
+                activityData = await getPlayerThirtyDaysData(activityId, serverId, roleId);
                 break;
             }
         case ACTIVITY_TYPE.SELF_SERVICE_SHOP://自选商店 糜家商队 13
@@ -237,6 +235,10 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
         return null
     }
     return activityData;
+    } catch(e) {
+        console.log('activity error', activityId, activityType);
+        return null;
+    }
 }
 
 export async function getActivityById(activityId: number) {