Merge branch 'bugfix' into dev
This commit is contained in:
commit
dbd1e72657
@ -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 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 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 => {
|
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 => {
|
users.map(v => {
|
||||||
if (v._id == 'system') return
|
if (G.config.serverId != v.player?.sid) return;
|
||||||
if (G.config.serverId != users.sid) return;
|
|
||||||
EmailFun.addEmail({
|
EmailFun.addEmail({
|
||||||
uid: v._id,
|
uid: v._id,
|
||||||
type: 'system',
|
type: 'system',
|
||||||
|
Loading…
Reference in New Issue
Block a user