qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/pay_for_diamond' into dev

Browse Source
This commit is contained in:
chenkai 2023-12-22 15:00:20 +08:00
commit 304a67e56f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api_s2c/event/payForDiamond/ApiCanReceive.ts
View File

@ -2,6 +2,7 @@ import { ApiCall } from "tsrpc";
import { HuoDongFun } from "../../../public/huodongfun"; import { HuoDongFun } from "../../../public/huodongfun";
import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive';
import { PublicShared } from "../../../shared/public/public"; import { PublicShared } from "../../../shared/public/public";
import { ActionLog } from "../../../public/actionLog/actionLog";
export async function playerCanReceive(call: ApiCall) { export async function playerCanReceive(call: ApiCall) {
const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId); 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 remaining = activityInfo.data['totalmoney'];
const showOffList = activityInfo.data['showOffList'] || []; const showOffList = activityInfo.data['showOffList'] || [];
const zeroTime = PublicShared.getToDayZeroTime(); const zeroTime = PublicShared.getToDayZeroTime();
const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime }); const vipScore = await ActionLog.getDayLog(call.uid, 'pay');
if (!dayPayInfo || !dayPayInfo.payNum) { if (!vipScore) {
return { return {
payNum: 0, remaining, result: false, activityInfo, showOffList payNum: 0, remaining, result: false, activityInfo, showOffList
}; };
} }
const payNum = dayPayInfo.payNum; const payNum = vipScore;
// 玩家充值未达标或者奖池余额耗尽则不能领取 // 玩家充值未达标或者奖池余额耗尽则不能领取
if (payNum < activityInfo.data['price'] || remaining <= 0) { if (payNum < activityInfo.data['price'] || remaining <= 0) {
return { 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) {
if (playerActivityInfo[zeroTime]?.length) { if (playerActivityInfo[zeroTime]) {
return { return {
payNum, remaining, result: false, activityInfo, showOffList payNum, remaining, result: false, activityInfo, showOffList
}; };

3
src/api_s2c/event/payForDiamond/ApiReceive.ts
View File

@ -92,10 +92,9 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
const zeroTime = PublicShared.getToDayZeroTime(); const zeroTime = PublicShared.getToDayZeroTime();
const setObj = {}; const setObj = {};
setObj[zeroTime] = gotAmount; 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 $set: setObj
}, {upsert: true}); }, {upsert: true});
console.log('updatecEventResult', JSON.stringify(updatecEventResult));
// 记录玩家日志. 仅保留最近 10 条 // 记录玩家日志. 仅保留最近 10 条
if (showOff) { if (showOff) {
await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}}); await G.mongodb.collection('hdinfo').updateOne({ hdid: call.req.activityId, }, { $push: { 'data.showOffList': { $each: [{ name: call.conn.gud.name, gotAmount }], $slice: -10 }}});

4
src/json/pmd.json5
View File

@ -14,7 +14,5 @@
//黑帮争霸争霸赛第二名 //黑帮争霸争霸赛第二名
hbzb_pmd2: 'intr_pmd_hbzb2', hbzb_pmd2: 'intr_pmd_hbzb2',
//黑帮争霸争霸赛第三名 //黑帮争霸争霸赛第三名
hbzb_pmd3: 'intr_pmd_hbzb3', hbzb_pmd3: 'intr_pmd_hbzb3'
// 充值抢钻石 - 抢到大量钻石
pay_for_diamond: 'intr_pmd_pfd'
} }