From ec8596163343f34987ca416f6ab63009522b8001 Mon Sep 17 00:00:00 2001
From: dy <qx@q.com>
Date: Wed, 3 Jan 2024 14:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC=E8=BD=AE?=
 =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_o2s/hdinfo/Apidetails.ts           |  2 +-
 src/api_s2c/event/leijichongzhi/ApiOpen.ts |  2 +-
 src/api_s2c/event/leijichongzhi/ApiRec.ts  | 11 +++++++----
 src/api_s2c/hongdian/fun.ts                |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/api_o2s/hdinfo/Apidetails.ts b/src/api_o2s/hdinfo/Apidetails.ts
index 3e26fba..d96e313 100644
--- a/src/api_o2s/hdinfo/Apidetails.ts
+++ b/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)
         }
diff --git a/src/api_s2c/event/leijichongzhi/ApiOpen.ts b/src/api_s2c/event/leijichongzhi/ApiOpen.ts
index 75a9c9b..e0a058d 100644
--- a/src/api_s2c/event/leijichongzhi/ApiOpen.ts
+++ b/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.etime)) * 10
     payNum = payNum - (db?.round || 0) * R.sort((a, b) => b.total - a.total)(_hdinfo.data.tasks)[0].total
diff --git a/src/api_s2c/event/leijichongzhi/ApiRec.ts b/src/api_s2c/event/leijichongzhi/ApiRec.ts
index 5586907..27d601b 100644
--- a/src/api_s2c/event/leijichongzhi/ApiRec.ts
+++ b/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,8 +39,11 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
     });
 }
 
-export async function checkNextRound(call: ApiCall, event, tasks) {
-    if ((event?.recIndex?.length || 0) < tasks.length) return event
+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}`
     return (await G.mongodb.cEvent(_dbType).findOneAndUpdate(
diff --git a/src/api_s2c/hongdian/fun.ts b/src/api_s2c/hongdian/fun.ts
index f8a301b..ec2094a 100644
--- a/src/api_s2c/hongdian/fun.ts
+++ b/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;