From c8d6f7d4333c71dd82d0a21b69ffc0deff09b900 Mon Sep 17 00:00:00 2001
From: dy <askjjdk@153.com>
Date: Mon, 18 Dec 2023 19:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC=E7=BB=8F?=
 =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97=EF=BC=8C=E5=BC=80?=
 =?UTF-8?q?=E6=9C=8D=E7=8B=82=E6=AC=A2=E8=BF=9B=E5=BA=A6=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96dayPay=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/kaifukuanghuan/ApiOpen.ts | 4 ++--
 src/public/pay.ts                           | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api_s2c/event/kaifukuanghuan/ApiOpen.ts b/src/api_s2c/event/kaifukuanghuan/ApiOpen.ts
index 3f2dc96..94cb0c2 100644
--- a/src/api_s2c/event/kaifukuanghuan/ApiOpen.ts
+++ b/src/api_s2c/event/kaifukuanghuan/ApiOpen.ts
@@ -31,7 +31,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
 
     call.succ({
         ...ops,
-        day: PublicShared.getOpenServerDay(call.conn.gud.cTime),
+        day: PublicShared.getOpenServerDay(),
         taskFinished: taskFinished
     });
 }
@@ -79,7 +79,7 @@ export async function getTaskVal(gud: player, taskTyps: string[]) {
         else if (t.indexOf('toDayPay') != -1) {
             let daystr = t.split('_')[1] || '1';
             let day = Number(daystr);
-            let zeroTime = PublicShared.getToDayZeroTime(gud.cTime);
+            let zeroTime = PublicShared.getToDayZeroTime(G.openTime);
             val[t] = await PayFun.getPayDaysAllPayNum(
                 gud.uid,
                 zeroTime + (day - 1) * 24 * 3600, zeroTime + day * 24 * 3600
diff --git a/src/public/pay.ts b/src/public/pay.ts
index 9a72587..cd9014e 100644
--- a/src/public/pay.ts
+++ b/src/public/pay.ts
@@ -478,9 +478,10 @@ export class PayFun {
      * 获取某个时间段内 玩家的充值总金额
      */
     static async getPayDaysAllPayNum(uid: string, sTime: number, eTime: number) {
-        let logs = await G.mongodb.collection('dayPay').find({uid: uid}).toArray() || [];
-
-        logs = logs.filter(log => log.time >= sTime && log.time < eTime);
+        let logs = await G.mongodb.collection('dayPay').find({
+            uid: uid,
+            time: {$gte: sTime, $lt: eTime}
+        }).toArray() || [];
 
         if (logs.length <= 0) return 0;
         return logs.map(log => log.payNum).reduce((a, b) => a + b);