Compare commits

..

No commits in common. "1158f26eaa336b8b06a971235b567d743961fc63" and "6efe04ed6d3b3d73b9b88b005cae8213483762b8" have entirely different histories.

4 changed files with 6 additions and 11 deletions

View File

@ -32,7 +32,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let rankList = sortRankList(_hd.data.rank, list)
let users = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray()
let users = await G.crossmongodb.collection('xfjs_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray()
rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}}))
@ -75,7 +75,7 @@ async function getMyData(call, rankList) {
let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({uid: call.uid})
let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, myUser, {upsert: true})
G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true})
if (!myCut) {
myCut = {_id: myUser.uid, total: 0}

View File

@ -11,8 +11,8 @@ export default async function (call: ApiCall<ReqhdGetList, ReshdGetList>) {
// 消费竞赛是跨服活动,活动开启时,同步当前用户信息到跨服数据库
G.huodong.xfjs = !!_hdList.find(i => i.htype == 11);
if (G.huodong.xfjs) {
if (G.huodong.xfjs){
let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
G.crossmongodb.collection('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true})
}
}

View File

@ -134,5 +134,5 @@ export type MongodbCollections = {
shop: CollectionShop
pushgift:CollectionPushGift
huodong_user: CollectionUser;
xfjs_user: CollectionUser;
};

View File

@ -438,12 +438,7 @@ const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[]
{
key: {zkey: 1}
},
],
huodong_user: [
{
key: {uid: 1}, unique: true,
}
],
]
};
export async function initMongoDB() {