From ed4df6fc3ebedf7bc7b5dcfb122a571ba643952b Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 27 Apr 2022 12:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=EF=BC=9A=E6=9C=AA?=
 =?UTF-8?q?=E5=88=B0=E6=97=B6=E9=97=B4=E5=8D=B4=E5=8F=AF=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/activity/sevenDaysService.ts | 20 +++++++++++--------
 shared/domain/activityField/sevenDaysField.ts |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/game-server/app/services/activity/sevenDaysService.ts b/game-server/app/services/activity/sevenDaysService.ts
index a39308899..7e56ff548 100644
--- a/game-server/app/services/activity/sevenDaysService.ts
+++ b/game-server/app/services/activity/sevenDaysService.ts
@@ -24,8 +24,9 @@ export async function sevenDaysActivity(serverId: number, roleId: string, type:
         return null;
     }
     let activityData: ActivityModelType = activityDataArray[0];
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let playerData = new SevenDaysData(activityData, createTime)
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new SevenDaysData(activityData, createTime, serverTime);
     //成长数据
     let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
     let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
@@ -81,8 +82,9 @@ export async function getPlayerSevenDaysData(activityId: number, serverId: numbe
    */
 export async function getPlayerSevenDaysGrowthData(activityId: number, serverId: number, roleId: string) {
     let activityData: ActivityModelType = await getActivityById(activityId);
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let playerData = new SevenDaysData(activityData, createTime)
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new SevenDaysData(activityData, createTime, serverTime);
     //成长数据
     let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
     let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
@@ -103,8 +105,9 @@ export async function getPlayerSevenDaysGrowthData(activityId: number, serverId:
    */
 export async function getPlayerSevenDaysDailyChallengesData(activityId: number, serverId: number, roleId: string) {
     let activityData: ActivityModelType = await getActivityById(activityId);
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let playerData = new SevenDaysData(activityData, createTime)
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new SevenDaysData(activityData, createTime, serverTime);
     //今日挑战
     let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
     playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
@@ -122,8 +125,9 @@ export async function getPlayerSevenDaysDailyChallengesData(activityId: number,
 export async function getPlayerSevenDaysDailyGiftsData(activityId: number, serverId: number, roleId: string) {
     let activityData: ActivityModelType = await getActivityById(activityId);
 
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let playerData = new SevenDaysData(activityData, createTime)
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new SevenDaysData(activityData, createTime, serverTime);
     //每日特惠礼包
     let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
     playerData.dailyGift.setPlayerRecords(playerRecords);
diff --git a/shared/domain/activityField/sevenDaysField.ts b/shared/domain/activityField/sevenDaysField.ts
index 3b7d529b5..c47d49cb4 100644
--- a/shared/domain/activityField/sevenDaysField.ts
+++ b/shared/domain/activityField/sevenDaysField.ts
@@ -326,7 +326,7 @@ export class SevenDaysData extends ActivityBase {
         this.dailyChallenge = new SevenDaysDailyChallengesData(objData.dailyChallenge)
     }
 
-    constructor(activityData: ActivityModelType, createTime: number, serverCreateTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverCreateTime: number) {
         super(activityData, createTime, serverCreateTime)
         this.initData(activityData.data)
     }