diff --git a/shared/domain/activityField/refreshShopField.ts b/shared/domain/activityField/refreshShopField.ts index cc46451b6..665170c35 100644 --- a/shared/domain/activityField/refreshShopField.ts +++ b/shared/domain/activityField/refreshShopField.ts @@ -1,5 +1,7 @@ +import { SHOP_REFRESH_TYPE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityRefreshShopModelType, GoodsInfo } from '../../db/ActivityRefreshShop'; +import { getZeroPoint, getZeroPointOfTime } from '../../pubUtils/timeUtil'; import { ActivityBase } from './activityField'; // 每个商品的内容 @@ -17,6 +19,7 @@ export class RefreshShopItem { levelLimitMin: number; //玩家最低等级 0:不限制 levelLimitMax: number; //玩家最高等级 0:不限制 weight: number; //随机权重 + refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE.FOREVER; buyCount: number = 0; //购买过的次数 @@ -34,7 +37,18 @@ export class RefreshShopItem { this.levelLimitMin = data.levelLimitMin ? data.levelLimitMin : 0; this.levelLimitMax = data.levelLimitMax ? data.levelLimitMax : 0; this.weight = data.weight ? data.weight : 0; - this.buyCount = 0; + if(data.refreshType) this.refreshType = data.refreshType; + } + + setBuyRecords(data: ActivityRefreshShopModelType) { + if(!data) return; + let refZeroPoint = getZeroPoint(this.refreshType); + let records = data.records ? data.records : []; + let buyRecords = records.filter(obj => { + let curRefTime = getZeroPointOfTime(obj.time); + return obj && obj.id === this.id && obj.pageIndex == this.pageIndex && curRefTime == refZeroPoint + }); + this.buyCount = buyRecords.length; } } @@ -130,11 +144,9 @@ export class RefreshShopData extends ActivityBase { if (!data) { return; } - let records = data.records ? data.records : []; for (let pageData of this.list) { for (let item of pageData.items) { - let buyRecords = records.filter(obj => { return obj && obj.id === item.id && obj.pageIndex == pageData.pageIndex }); - item.buyCount = buyRecords.length; + item.setBuyRecords(data); } } diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts index d2c4c9ecd..c19822ead 100644 --- a/shared/pubUtils/timeUtil.ts +++ b/shared/pubUtils/timeUtil.ts @@ -471,6 +471,8 @@ export function getZeroPoint(refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE. return t.getWeekZeroPoint(); } else if (refreshType == SHOP_REFRESH_TYPE.MONTHLY) { return t.getMonthZeroPoint(); + } else { + return 0 } }