活动：重写七天乐活动的数据结构

2021-06-04 11:54:47 +08:00
parent f77de8eb78
commit d6134ce67e
12 changed files with 852 additions and 110 deletions
@@ -2,7 +2,7 @@ import { ACTIVITY_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
 import { ServerlistModel } from '../db/Serverlist';
-import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGiftsField';
+import { DailyGiftsData } from '../domain/activityField/dailyGiftsField';



@@ -0,0 +1,128 @@
+import { ACTIVITY_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
+import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../db/ActivityGrowthPoint';
+import { HeroModel } from '../db/Hero';
+import { ServerlistModel } from '../db/Serverlist';
+import { SevenDaysData } from '../domain/activityField/sevenDaysField';
+import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
+import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
+
+/**
+   * 获取活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function sevenDaysActivity(serverId: number, roleId: string, type: number) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, type, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+
+    let playerData = new SevenDaysData(activityData)
+    //成长数据
+    let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
+    let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
+    let userHeroes = await HeroModel.findByRole(roleId);
+    await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
+    playerData.growth.setPlayerPointRecord(playerPointRecord);
+    //今日挑战
+    let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityData.activityId, roleId);
+    playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
+    //每日特惠礼包
+    let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityData.activityId, roleId);
+    playerData.dailyGift.setPlayerRecords(playerRecords);
+
+    return playerData;
+}
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerSevenDaysData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+
+    let playerData = new SevenDaysData(activityData)
+    //成长数据
+    let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
+    let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
+    let userHeroes = await HeroModel.findByRole(roleId);
+    await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
+    playerData.growth.setPlayerPointRecord(playerPointRecord);
+    //今日挑战
+    let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
+    playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
+    //每日特惠礼包
+    let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
+    playerData.dailyGift.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+
+/**
+   * 玩家成长数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerSevenDaysGrowthData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+
+    let playerData = new SevenDaysData(activityData)
+    //成长数据
+    let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
+    let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
+    let userHeroes = await HeroModel.findByRole(roleId);
+    await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
+    playerData.growth.setPlayerPointRecord(playerPointRecord);
+    return playerData;
+}
+
+
+/**
+   * 玩家今日挑战数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerSevenDaysDailyChallengesData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+
+    let playerData = new SevenDaysData(activityData)
+    //今日挑战
+    let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
+    playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
+    return playerData;
+}
+
+/**
+   * 玩家每日特惠礼包数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerSevenDaysDailyGiftsData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+
+    let playerData = new SevenDaysData(activityData)
+    //每日特惠礼包
+    let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
+    playerData.dailyGift.setPlayerRecords(playerRecords);
+    return playerData;
+}
@@ -120,10 +120,10 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
        let curDate = moment(createTime * 1000);
        if (curDate.hour() < REFRESH_TIME) {
            betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
-            endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate()
+            endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate()
        } else {
            betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate();
-            endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate()
+            endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate()
        }
        playerData.setNewPlayerDate(betinTime, endTime)
    }