diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts index addccf7..77f79fc 100644 --- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -2,6 +2,7 @@ import { ApiCall } from "tsrpc"; import { HuoDongFun } from "../../../public/huodongfun"; import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; import { PublicShared } from "../../../shared/public/public"; +import { ActionLog } from "../../../public/actionLog/actionLog"; export async function playerCanReceive(call: ApiCall) { const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); @@ -11,13 +12,13 @@ export async function playerCanReceive(call: ApiCall) { const remaining = activityInfo.data['totalmoney']; const showOffList = activityInfo.data['showOffList'] || []; const zeroTime = PublicShared.getToDayZeroTime(); - const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); - if (!dayPayInfo || !dayPayInfo.payNum) { + const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); + if (!vipScore) { return { payNum: 0, remaining, result: false, activityInfo, showOffList }; } - const payNum = dayPayInfo.payNum; + const payNum = vipScore; // 玩家充值未达标或者奖池余额耗尽则不能领取 if (payNum < activityInfo.data['price'] || remaining <= 0) { return { @@ -25,9 +26,9 @@ export async function playerCanReceive(call: ApiCall) { } } // 检查玩家今日是否已经领取 - const playerActivityInfo = G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid }); + const playerActivityInfo = await G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid, type: 'payForDiamond' }); if (playerActivityInfo) { - if (playerActivityInfo[zeroTime]?.length) { + if (playerActivityInfo[zeroTime]) { return { payNum, remaining, result: false, activityInfo, showOffList }; diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts index 0bcaab3..315e517 100644 --- a/src/api_s2c/event/payForDiamond/ApiReceive.ts +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -92,10 +92,9 @@ export default async function (call: ApiCall) { const zeroTime = PublicShared.getToDayZeroTime(); const setObj = {}; setObj[zeroTime] = gotAmount; - const updatecEventResult = await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, { + await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid, type: 'payForDiamond' }, { $set: setObj }, {upsert: true}); - console.log('updatecEventResult', JSON.stringify(updatecEventResult)); // 记录玩家日志. 仅保留最近 10 条 if (showOff) { await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); diff --git a/src/json/pmd.json5 b/src/json/pmd.json5 index bd2ec62..2e0db1c 100644 --- a/src/json/pmd.json5 +++ b/src/json/pmd.json5 @@ -14,7 +14,5 @@ //黑帮争霸争霸赛第二名 hbzb_pmd2: 'intr_pmd_hbzb2', //黑帮争霸争霸赛第三名 - hbzb_pmd3: 'intr_pmd_hbzb3', - // 充值抢钻石 - 抢到大量钻石 - pay_for_diamond: 'intr_pmd_pfd' + hbzb_pmd3: 'intr_pmd_hbzb3' } \ No newline at end of file