Merge branch 'feature/warning' into bugfix

src/api_s2c/event/leijichongzhi/ApiOpen.ts

@@ -25,8 +25,8 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     }
     db = await checkNextRound(call, db, _hdinfo.data.tasks)
 
-    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10
+    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.etime)) * 10
-    payNum = payNum - (db.round || 0) * R.sort((a, b) => b.total - a.total)(_hdinfo.data.tasks)[0].total
+    payNum = payNum - (db?.round || 0) * R.sort((a, b) => b.total - a.total)(_hdinfo.data.tasks)[0].total
 
     call.succ({
         sTime: sTime,

src/api_s2c/event/leijichongzhi/ApiRec.ts

@@ -40,8 +40,9 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
 }
 
 export async function checkNextRound(call: ApiCall, event, tasks) {
-    let _dbType: `leijichongzhi${number}` = `leijichongzhi${call.req.hdid}`
     if ((event?.recIndex?.length || 0) < tasks.length) return event
+
+    let _dbType: `leijichongzhi${number}` = `leijichongzhi${call.req.hdid}`
     return (await G.mongodb.cEvent(_dbType).findOneAndUpdate(
         {uid: call.uid, type: _dbType},
         {$set: {recIndex: []}, $inc: {round: 1}}, {returnDocument: 'after'}

src/api_s2c/event/xiaofeijingsai/ApiOpen.ts

@@ -72,7 +72,17 @@ async function getMyData(call: ApiCall, rankList) {
     })
 
     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('huodong_user').updateOne({uid: call.uid}, {
+        $set: {
+            lv: myUser.lv,
+            vip: myUser.vip,
+            name: myUser.name,
+            sid: myUser.sid,
+            nexp: myUser.nexp,
+            head: myUser.head,
+            headFrame: myUser.headFrame
+        }
+    }, {upsert: true})
 
     if (!myCut) {
         myCut = {_id: myUser.uid, total: 0}

src/api_s2c/eventlist/ApihdGetList.ts

@@ -14,6 +14,16 @@ export default async function (call: ApiCall<ReqhdGetList, ReshdGetList>) {
     if (G.huodong.xfjs) {
         G.huodong.xfjsId = _hdList.find(i => i.htype == 11).hdid
         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('huodong_user').updateOne({uid: call.uid}, {
+            $set: {
+                lv: myUser.lv,
+                vip: myUser.vip,
+                name: myUser.name,
+                sid: myUser.sid,
+                nexp: myUser.nexp,
+                head: myUser.head,
+                headFrame: myUser.headFrame
+            }
+        }, {upsert: true})
     }
 }

src/public/player.ts

@@ -231,12 +231,16 @@ export class PlayerFun {
             atn
         }
         G.mongodb.collection('rmbuse').insertOne(data);
-        // 消费竞赛开启时写入跨服数据库
+        if (data.isAdd){
-        if (G.huodong.xfjs && !data.isAdd && typeof data.change == 'number') {
+            ActionLog.addDayLog(uid, { key: 'addRmbmoney', val: atn.n });
-            G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid, type: `xfjs_${G.huodong.xfjsId}`}, {
+        }else {
-                $set: {time: G.time},
+            // 消费竞赛开启时写入跨服数据库
-                $inc: {change: data.change}
+            if (G.huodong.xfjs && typeof data.change == 'number') {
-            }, {upsert: true});
+                G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid, type: `xfjs_${G.huodong.xfjsId}`}, {
+                    $set: {time: G.time},
+                    $inc: {change: data.change}
+                }, {upsert: true});
+            }
         }
     }