From 42daf348b9545d920b14d80021fec8d95be10365 Mon Sep 17 00:00:00 2001 From: dy Date: Sun, 31 Dec 2023 13:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_xiaofeijingsai.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/public/scheduler/scheduler_xiaofeijingsai.ts b/src/public/scheduler/scheduler_xiaofeijingsai.ts index 856165d..8c42306 100644 --- a/src/public/scheduler/scheduler_xiaofeijingsai.ts +++ b/src/public/scheduler/scheduler_xiaofeijingsai.ts @@ -39,17 +39,20 @@ export class Scheduler_xfjs_Local_Ctor extends Scheduler { let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 100 - let rmbuse = await G.crossmongodb.collection('rmbuse').find({type: `xfjs_${G.huodong.xfjsId}`}).sort({change: 1}).limit(limit).toArray() + let rmbuse = await G.crossmongodb.collection('rmbuse').find({type: `xfjs_${_hd.hdid}`}).sort({change: 1}).limit(limit).toArray() let list: any = rmbuse.map(i => ({...i, total: R.negate(i.change)})) - let ranklist = sortRankList(_hd.data.rank, list) + let rankList = sortRankList(_hd.data.rank, list) + + let userList = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i != 'system')}}).toArray() + + rankList = rankList.map(i => ({...i, player: userList.find(v => v.uid == i.uid) || {}})) R.forEach(i => { - let users = R.slice(i.rank[0] - 1, i.rank[1])(ranklist) + let users = R.slice(i.rank[0] - 1, i.rank[1])(rankList).filter(i => i._id != 'system') users.map(v => { - if (v._id == 'system') return - if (G.config.serverId != users.sid) return; + if (G.config.serverId != v.player?.sid) return; EmailFun.addEmail({ uid: v._id, type: 'system',