Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
This commit is contained in:
commit
9964e12f80
@ -31,7 +31,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
|
|||||||
|
|
||||||
call.succ({
|
call.succ({
|
||||||
...ops,
|
...ops,
|
||||||
day: PublicShared.getOpenServerDay(call.conn.gud.cTime),
|
day: PublicShared.getOpenServerDay(),
|
||||||
taskFinished: taskFinished
|
taskFinished: taskFinished
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -79,7 +79,7 @@ export async function getTaskVal(gud: player, taskTyps: string[]) {
|
|||||||
else if (t.indexOf('toDayPay') != -1) {
|
else if (t.indexOf('toDayPay') != -1) {
|
||||||
let daystr = t.split('_')[1] || '1';
|
let daystr = t.split('_')[1] || '1';
|
||||||
let day = Number(daystr);
|
let day = Number(daystr);
|
||||||
let zeroTime = PublicShared.getToDayZeroTime(gud.cTime);
|
let zeroTime = PublicShared.getToDayZeroTime(G.openTime);
|
||||||
val[t] = await PayFun.getPayDaysAllPayNum(
|
val[t] = await PayFun.getPayDaysAllPayNum(
|
||||||
gud.uid,
|
gud.uid,
|
||||||
zeroTime + (day - 1) * 24 * 3600, zeroTime + day * 24 * 3600
|
zeroTime + (day - 1) * 24 * 3600, zeroTime + day * 24 * 3600
|
||||||
|
@ -478,9 +478,10 @@ export class PayFun {
|
|||||||
* 获取某个时间段内 玩家的充值总金额
|
* 获取某个时间段内 玩家的充值总金额
|
||||||
*/
|
*/
|
||||||
static async getPayDaysAllPayNum(uid: string, sTime: number, eTime: number) {
|
static async getPayDaysAllPayNum(uid: string, sTime: number, eTime: number) {
|
||||||
let logs = await G.mongodb.collection('dayPay').find({uid: uid}).toArray() || [];
|
let logs = await G.mongodb.collection('dayPay').find({
|
||||||
|
uid: uid,
|
||||||
logs = logs.filter(log => log.time >= sTime && log.time < eTime);
|
time: {$gte: sTime, $lt: eTime}
|
||||||
|
}).toArray() || [];
|
||||||
|
|
||||||
if (logs.length <= 0) return 0;
|
if (logs.length <= 0) return 0;
|
||||||
return logs.map(log => log.payNum).reduce((a, b) => a + b);
|
return logs.map(log => log.payNum).reduce((a, b) => a + b);
|
||||||
|
Loading…
Reference in New Issue
Block a user