diff --git a/src/api_s2c/event/shiwuleichong/ApiOpen.ts b/src/api_s2c/event/shiwuleichong/ApiOpen.ts index de01636..7954da3 100644 --- a/src/api_s2c/event/shiwuleichong/ApiOpen.ts +++ b/src/api_s2c/event/shiwuleichong/ApiOpen.ts @@ -13,27 +13,28 @@ export default async function (call: ApiCall) { let _zt = PublicShared.getToDayZeroTime(); let pays = await PayFun.getPayLogs(call.uid, payids); for (; day <= G.gc.shiwuleichong.tasks.length; day++) { - let pay = pays[G.gc.shiwuleichong.tasks[day - 1].payid]; - if (!pay || pay.length == 0) { + let pay = pays[G.gc.shiwuleichong.tasks[day].payid]; + if (!pay) { break } else { - // 如果是最后一天奖励 - if (day >= G.gc.shiwuleichong.tasks.length) { - // 充值订单隔天了 - if (pay.slice(-1)[0].time < _zt) { - // 重置所有订单 - await PayFun.delPayLog(call.uid, ...payids.map(i => { - return {payId: i, val: []} - })) - day = 1; - pays = {}; - } - break; - } else if (pay.slice(-1)[0].time >= _zt) { + if (pay.slice(-1)[0].time >= _zt) { break } } } + // 如果是最后一天奖励 并且 充值订单隔天了 + if ( + day == G.gc.shiwuleichong.tasks.length && + pays[G.gc.shiwuleichong.tasks[day - 1].payid] && + pays[G.gc.shiwuleichong.tasks[day - 1].payid].slice(-1)[0].time < _zt + ) { + // 重置所有订单 + await PayFun.delPayLog(call.uid, ...payids.map(i => { + return {payId: i, val: []} + })) + day = 1; + pays = {}; + } call.succ({ day: day,