From a1ab3628ed940021e26b70ce6254b9a79743b531 Mon Sep 17 00:00:00 2001 From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97,=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- packages/zutils | 2 +- src/controllers/chest.controller.ts | 4 ++-- src/controllers/game.controller.ts | 16 +++++++--------- src/controllers/tasks.controller.ts | 4 ++-- src/models/ActivityChest.ts | 2 ++ src/services/rank.svr.ts | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 7122a94..3eac1e9 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "prod:admin": "node dist/admin.js", "lint": "eslint --ext .ts src/**", "format": "eslint --ext .ts src/** --fix", - "initdata": "ts-node src/initdata.ts" + "initdata": "ts-node src/initdata.ts", + "test": "ts-node -r tsconfig-paths/register src/test.ts" }, "author": "zhl", "license": "ISC", diff --git a/packages/zutils b/packages/zutils index 0d231aa..039c07f 160000 --- a/packages/zutils +++ b/packages/zutils @@ -1 +1 @@ -Subproject commit 0d231aa9ed56073c170b41a2c676696e97b1c6ce +Subproject commit 039c07ff1ca0ddcb6e728aea6029f2144ef99d13 diff --git a/src/controllers/chest.controller.ts b/src/controllers/chest.controller.ts index 74516d9..db497c5 100644 --- a/src/controllers/chest.controller.ts +++ b/src/controllers/chest.controller.ts @@ -88,7 +88,7 @@ class BoxController extends BaseController { const score = records[i].score result.push({ nickname: u?.twitterName || u?.discordName || u?.address ? formatAddress(u.address) : 'unknown', - avatar: u.twitterAvatar || '', + avatar: u?.twitterAvatar || '', score: score, // @ts-ignore time: records[i].createdAt.getTime(), @@ -113,7 +113,7 @@ class BoxController extends BaseController { const score = records[i].myScore || 0 result.push({ nickname: u?.twitterName || u?.discordName || u?.address ? formatAddress(u.address) : 'unknown', - avatar: u.twitterAvatar || '', + avatar: u?.twitterAvatar || '', score: score, // @ts-ignore time: records[i].createdAt.getTime(), diff --git a/src/controllers/game.controller.ts b/src/controllers/game.controller.ts index bc1e9d8..2cf3169 100644 --- a/src/controllers/game.controller.ts +++ b/src/controllers/game.controller.ts @@ -35,7 +35,7 @@ class GameController extends BaseController { } const record = await checkInToday(address, dateTag) if (!record) { - throw new ZError(13, 'had not signed in') + throw new ZError(13, 'had not check in') } const ticketRecord = new TicketRecord({ user: user.id, @@ -88,10 +88,9 @@ class GameController extends BaseController { if (days < 1) { throw new ZError(12, 'invalid days') } - const dateTag = formatDate(new Date()) - const checkRecord = await checkInToday(user.address.toLowerCase(), dateTag) + const checkRecord = await CheckIn.findOne({ from: user.address.toLowerCase() }).sort({ _id: -1 }) if (!checkRecord) { - throw new ZError(12, 'not signed in') + throw new ZError(12, 'no onchain check in record') } if (days > checkRecord.total) { throw new ZError(13, 'invalid days') @@ -139,10 +138,9 @@ class GameController extends BaseController { if (days < 1) { throw new ZError(12, 'invalid days') } - const dateTag = formatDate(new Date()) - const checkRecord = await checkInToday(user.address.toLowerCase(), dateTag) + const checkRecord = await CheckIn.findOne({ from: user.address.toLowerCase() }).sort({ _id: -1 }) if (!checkRecord) { - throw new ZError(12, 'not signed in') + throw new ZError(12, 'no onchain check in record') } if (days > checkRecord.total) { throw new ZError(13, 'invalid days') @@ -272,8 +270,8 @@ class GameController extends BaseController { signCfg, todayStat, todayTickets: 1, - daysTotal: checkRecord?.total || 0, - daysSeq: checkRecord?.count || 0, + daysTotal: lastRecord?.total || 0, + daysSeq: lastRecord?.count || 0, seqStat, totalStat, } diff --git a/src/controllers/tasks.controller.ts b/src/controllers/tasks.controller.ts index 24b00b9..44f94e5 100644 --- a/src/controllers/tasks.controller.ts +++ b/src/controllers/tasks.controller.ts @@ -138,7 +138,7 @@ export default class TasksController extends BaseController { if (dateTag && currentDateTag !== dateTag) { throw new ZError(11, 'task date not match') } - if (!activity.isVaild()) { + if (!activity?.isVaild()) { throw new ZError(15, 'activity not start or end') } let cfg = activity.tasks.find((t: TaskCfg) => t.id === taskId) @@ -173,7 +173,7 @@ export default class TasksController extends BaseController { const activity = req.activity const { task } = req.params const [taskId, dateTag] = task.split(':') - if (!activity.isVaild()) { + if (!activity?.isVaild()) { throw new ZError(15, 'activity not start or end') } let cfg = activity.tasks.find((t: TaskCfg) => t.id === taskId) diff --git a/src/models/ActivityChest.ts b/src/models/ActivityChest.ts index 523778d..4608b3b 100644 --- a/src/models/ActivityChest.ts +++ b/src/models/ActivityChest.ts @@ -31,7 +31,9 @@ export enum ChestStatusEnum { timeStr = randomStr + timeStr.slice(1) } let shortId = timeStr + this.id.slice(-6) + console.log(shortId) this.shareCode = convert({ numStr: shortId, base: 16, to: 52, alphabet }) + console.log(this.id, this.shareCode) } }) export class ActivityChestClass extends BaseModule { diff --git a/src/services/rank.svr.ts b/src/services/rank.svr.ts index d350d87..a4050b0 100644 --- a/src/services/rank.svr.ts +++ b/src/services/rank.svr.ts @@ -46,7 +46,7 @@ export const updateRankScore = async ({ if (rebateLevel > 0) { let userMod = await ActivityUser.findById(user) if (userMod?.inviteUser) { - const score1 = scoreParams.score * INVITE_REBATE + const score1 = score * INVITE_REBATE let scoreParams1 = Object.assign({ fromUser: user }, scoreParams) const keyInvite = `${activity}:invite` await updateRankInvite(keyInvite, parseInt(score1 * 100 + ''), `${userMod.inviteUser}_${user}`)