xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(幸运转盘):统计抽奖记录由gid改为id

Browse Source
This commit is contained in:
zhangxk
2023-10-19 11:06:02 +08:00
committed by luying
parent 850f6656c7
commit 4070ca1549
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/db/ActivityLuckyRec.ts
View File

@@ -10,6 +10,9 @@ export class TurntableRecord {
@prop({ required: true }) @prop({ required: true })
count: number; count: number;
@prop({ required: true })
id: number;
} }
export class FloorRecord { export class FloorRecord {
@@ -42,8 +45,8 @@ export default class Activity_Lucky_Rec extends BaseModel {
@prop({ required: true }) @prop({ required: true })
count: number; // 抽卡次数 count: number; // 抽卡次数
@prop({ required: true }) // @prop({ required: true })
greatRewardCount: number; // 中头奖次数 // greatRewardCount: number; // 中头奖次数
@prop({ required: true }) @prop({ required: true })
todayCount: number; // 本日抽卡 todayCount: number; // 本日抽卡

14
shared/domain/activityField/luckyField.ts
View File

@@ -104,9 +104,9 @@ export class LuckyData extends ActivityBase {
private getGidMap() { private getGidMap() {
let gidMap = new Map<number, number>(); let gidMap = new Map<number, number>();
for (let { gid } of this.records) { for (let { id } of this.records) {
let num = (gidMap.get(gid) || 0) + 1; let num = (gidMap.get(id) || 0) + 1;
gidMap.set(gid, num); gidMap.set(id, num);
} }
return gidMap; return gidMap;
} }
@@ -115,8 +115,8 @@ export class LuckyData extends ActivityBase {
let gidMap = this.getGidMap(); let gidMap = this.getGidMap();
let pool: LuckyPool[] = []; let pool: LuckyPool[] = [];
for (let obj of this.pool) { for (let obj of this.pool) {
let { gid, numLimit } = obj; let { id, numLimit } = obj;
if (numLimit == -1 || numLimit > (gidMap.get(gid) || 0)) pool.push(obj); if (numLimit == -1 || numLimit > (gidMap.get(id) || 0)) pool.push(obj);
} }
return pool; return pool;
} }
@@ -192,7 +192,7 @@ export class LuckyData extends ActivityBase {
} }
this.count++; this.count++;
this.todayCount++; this.todayCount++;
let record = { roleName, gid: randResult.gid, count: randResult.count }; let record = { roleName, gid: randResult.gid, count: randResult.count, id: randResult.id };
records.push([record.roleName, record.gid, record.count]); records.push([record.roleName, record.gid, record.count]);
this.records.push(record); this.records.push(record);
result.push(randResult.id); result.push(randResult.id);
@@ -228,7 +228,7 @@ export class LuckyData extends ActivityBase {
let gidMap = this.getGidMap(); let gidMap = this.getGidMap();
for (let obj of this.pool) { for (let obj of this.pool) {
obj.getCnt = (gidMap.get(obj.gid) || 0); obj.getCnt = (gidMap.get(obj.id) || 0);
} }
this.floorRecord = floorRecord; this.floorRecord = floorRecord;