diff --git a/shared/domain/activityField/monthlyFundField.ts b/shared/domain/activityField/monthlyFundField.ts index 3eb63751f..3c1e649f2 100644 --- a/shared/domain/activityField/monthlyFundField.ts +++ b/shared/domain/activityField/monthlyFundField.ts @@ -3,7 +3,7 @@ import moment = require('moment'); import { SHOP_REFRESH_TYPE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityMonthlyFundModelType } from '../../db/ActivityMonthlyFund'; -import { getZeroPointD } from '../../pubUtils/timeUtil'; +import { getZeroPointOfTimeD } from '../../pubUtils/timeUtil'; import { deltaDays } from '../../pubUtils/util'; import { ActivityBase } from './activityField'; @@ -49,6 +49,7 @@ class MonthlyFundPage { price: number; // 购买价格 onceReward: string; // 购买后立刻可以获得的奖励 type&id&count rebate: number; // 显示用的返利倍数 + showBeginTime: number = 0; // 显示的开始时间 buyEndTime: number = 0; // 购买截止时间 rewards: MonthlyFundReward[] = []; // 每天签到可领取的奖励 @@ -61,6 +62,7 @@ class MonthlyFundPage { this.price = dataObj.price; this.onceReward = dataObj.onceReward; this.rebate = dataObj.rebate; + this.showBeginTime = beginTime; this.buyEndTime = beginTime + dataObj.buyEndDay * 86400000; for(let reward of (dataObj.rewards||[])) { this.rewards.push(new MonthlyFundReward(reward)); @@ -92,7 +94,6 @@ class MonthlyFundPage { } export class MonthlyFundData extends ActivityBase { - list: MonthlyFundPage[] = []; constructor(activityData: ActivityModelType, createTime: number, serverTime: number) { @@ -103,12 +104,13 @@ export class MonthlyFundData extends ActivityBase { public initData(data: string): void { let dataObj: MonthlyFundDataInDb = JSON.parse(data); if(!dataObj) return; + let zeroPoint = getZeroPointOfTimeD(this.beginTime, SHOP_REFRESH_TYPE.MONTHLY); for(let data of (dataObj.list||[])) { - let obj = new MonthlyFundPage(data, this.beginTime); + let obj = new MonthlyFundPage(data, zeroPoint.getTime()); if(obj) this.list.push(obj); } this.roundIndex = parseInt(moment(this.beginTime).format('YYYYMM')); - this.todayIndex = deltaDays(getZeroPointD(SHOP_REFRESH_TYPE.MONTHLY), new Date) + 1; + this.todayIndex = deltaDays(zeroPoint, new Date) + 1; } public setPlayerRecords(playerDatas: ActivityMonthlyFundModelType[]) {