Merge remote-tracking branch 'origin/bugfix' into bugfix

# Conflicts:
#	src/api_s2c/event/leijichongzhi/ApiRec.ts

src/api_o2s/hdinfo/Apidetails.ts

@@ -32,7 +32,7 @@ export default async function (call: ApiCall<Reqdetails, Resdetails>) {
             let _tmp = {
                 ranking: index,
                 participantId: elementUser.uid,
-                value: await (await PayFun.getPayDaysAllPayNum(elementUser.uid, element.stime, element.rtime)).toString()
+                value: await (await PayFun.getPayDaysAllPayNum(elementUser.uid, element.stime, element.etime)).toString()
             }
             accountingData.push(_tmp)
         }

src/api_s2c/event/leijichongzhi/ApiOpen.ts

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

src/api_s2c/event/leijichongzhi/ApiRec.ts

@@ -20,7 +20,7 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
     let db = await G.mongodb.cEvent(_dbType).findOne({uid: call.uid, type: _dbType});
     if (db.recIndex.includes(call.req.index)) return call.error('', {code: -2});
 
-    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
     if (payNum < conf.total) return call.error('', {code: -3});
 
@@ -31,7 +31,7 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
         {$push: {recIndex: call.req.index}}
     );
 
-    await checkNextRound(call, db, _hdinfo.data.tasks)
+    await checkNextRound(call, db, _hdinfo)
 
     HongDianChange.sendChangeKey(call.uid, ['huodonghd'])
     call.succ({
@@ -39,9 +39,13 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
     });
 }
 
-export async function checkNextRound(call: ApiCall, event, tasks) {
+export async function checkNextRound(call: ApiCall, event, _hdinfo) {
+    if ((event?.recIndex?.length || 0) < _hdinfo.data.tasks.length) return event
+    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.etime)) * 10
+    payNum = payNum - (event?.round || 0) * R.sort((a, b) => b.total - a.total)(_hdinfo.data.tasks)[0].total
+    if (payNum < 0) return event
+
     let _dbType: `leijichongzhi${number}` = `leijichongzhi${call.req.hdid}`
-    if ((event?.recIndex?.length || 0) < tasks.length) return event
     return (await G.mongodb.cEvent(_dbType).findOneAndUpdate(
         {uid: call.uid, type: _dbType},
         {$set: {recIndex: []}, $inc: {round: 1}}, {returnDocument: 'after'}

src/api_s2c/hongdian/fun.ts

@@ -656,7 +656,7 @@ export class HuoDongHongDianFun {
         let _con = hdCon.data.tasks;
         let db = await G.mongodb.cEvent(_dbType).findOne({uid: call.uid, type: _dbType});
         let _mydata = db || {sTime: PublicShared.getToDayZeroTime(G.time), recIndex: []};
-        let payNum = await PayFun.getPayDaysAllPayNum(call.uid, hdCon.stime, hdCon.rtime);
+        let payNum = await PayFun.getPayDaysAllPayNum(call.uid, hdCon.stime, hdCon.etime);
         for (let index = 0; index < _con.length; index++) {
             const element = _con[index];
             if (_mydata.recIndex.includes(index)) continue;