From 722e92a54b4b8e6357ab65dcd72a8d5adbc94d46 Mon Sep 17 00:00:00 2001
From: dy <askjjdk@153.com>
Date: Wed, 27 Dec 2023 21:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/xiaofeijingsai/ApiOpen.ts | 4 ++--
 src/api_s2c/eventlist/ApihdGetList.ts       | 4 ++--
 src/module/mongodb.ts                       | 2 +-
 src/setMongodb.ts                           | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts
index b3a47af..4862a90 100644
--- a/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts
+++ b/src/api_s2c/event/xiaofeijingsai/ApiOpen.ts
@@ -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('xfjs_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray()
+    let users = await G.crossmongodb.collection('huodong_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('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true})
+    G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, myUser, {upsert: true})
 
     if (!myCut) {
         myCut = {_id: myUser.uid, total: 0}
diff --git a/src/api_s2c/eventlist/ApihdGetList.ts b/src/api_s2c/eventlist/ApihdGetList.ts
index 63c1c23..fd35120 100644
--- a/src/api_s2c/eventlist/ApihdGetList.ts
+++ b/src/api_s2c/eventlist/ApihdGetList.ts
@@ -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('xfjs_user').updateOne({uid: call.uid}, myUser, {upsert: true})
+        G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
     }
 }
\ No newline at end of file
diff --git a/src/module/mongodb.ts b/src/module/mongodb.ts
index f4c5842..e5c920e 100644
--- a/src/module/mongodb.ts
+++ b/src/module/mongodb.ts
@@ -134,5 +134,5 @@ export type MongodbCollections = {
     shop: CollectionShop
     pushgift:CollectionPushGift
 
-    xfjs_user: CollectionUser;
+    huodong_user: CollectionUser;
 };
\ No newline at end of file
diff --git a/src/setMongodb.ts b/src/setMongodb.ts
index 7860f9c..f7a267b 100644
--- a/src/setMongodb.ts
+++ b/src/setMongodb.ts
@@ -438,7 +438,12 @@ const crossIndexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[]
         {
             key: {zkey: 1}
         },
-    ]
+    ],
+    huodong_user: [
+        {
+            key: {uid: 1}, unique: true,
+        }
+    ],
 };
 
 export async function initMongoDB() {