活动：目标点数兑换奖励过期判断

game-server/app/services/thirtyDaysService.ts

@@ -2,9 +2,11 @@ import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../db/ActivityThirtyDays';
 import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../db/ActivityBuyRecords';
-import { RoleModel } from '../db/Role';
 import { ThirtyDaysData, ThirtyDaysItem } from '../domain/activityField/thirtyDaysField';
 import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../db/ActivityThirtyDaysPointReward';
+import Role, { RoleModel } from '../db/Role';
+import moment = require('moment');
+import { deltaDays } from '../pubUtils/util';
 
 /**
    * 获取活动数据
@@ -20,15 +22,14 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
     activityArray = activityArray.sort((a, b) => {
         return a.acvitityId - b.acvitityId
     });
+    let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];
         let playerData = await getPlayerThirtyDaysData(activityData.acvitityId, serverId, roleId);
-        if (!playerData.isComplete()) {
-            return playerData;
-        }
+        allPlayerActivity.push(playerData)
     }
 
-    return null
+    return allPlayerActivity
 }
 
 /**
@@ -69,3 +70,20 @@ export async function addPlayerThirtyDaysTask(activityId: number, serverId: numb
     return playerData;
 }
 
+/**
+   * 玩家活动第几天
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function playerThirtyDaysActivityDays(roleId: string) {
+    let { createTime } = await RoleModel.findByRoleId(roleId);
+    let createDate = moment(createTime * 1000).toDate();
+    let todayIndex = deltaDays(createDate, new Date) + 1;
+    return todayIndex;
+}
+{
+
+}