Merge branch 'feature/xiaofeijingsai' into dev

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}

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})
     }
 }

src/module/mongodb.ts

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

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() {