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