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

首充改为直购

Browse Source
This commit is contained in:
dy 2023-12-19 14:59:28 +08:00
parent eb1e346988
commit 1a703f1ecd
5 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api_s2c/event/shouchong/ApiOpen.ts
View File

@ -1,11 +1,14 @@
import { ApiCall } from "tsrpc";
import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen";
import {PayFun} from "../../../public/pay";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'})
let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong)
call.succ({
payNum: call.conn.gud.payExp / 10,
receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []]))
});
receive: data?.receive || {},
buyLog: await PayFun.getPayLogs(call.uid, payIds)
})
}

46
src/api_s2c/event/shouchong/ApiReceive.ts
View File

@ -1,28 +1,31 @@
import { ApiCall } from "tsrpc";
import { PlayerFun } from '../../../public/player';
import { ReqReceive, ResReceive } from "../../../shared/protocols/event/shouchong/PtlReceive";
import { PublicShared } from '../../../shared/public/public';
import { HongDianChange } from "../../hongdian/fun";
import {ApiCall} from "tsrpc";
import {PlayerFun} from '../../../public/player';
import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive";
import {PublicShared} from '../../../shared/public/public';
import {HongDianChange} from "../../hongdian/fun";
import {PayFun} from "../../../public/pay";
export default async function (call: ApiCall<ReqReceive, ResReceive>) {
let conf = G.gc.shouchong[call.req.k];
if (!conf) return call.error(globalThis.lng.pata_getprize_1);
let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
let payLog = await PayFun.getPayLog(call.uid, conf.payid)
if (!payLog) return call.errorCode(-1)
let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' });
let recArr = data?.receive?.[call.req.k] || [];
if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
// if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3);
if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10);
await PlayerFun.sendPrize(call, conf.prize[recArr.length]);
await G.mongodb.cEvent('shouchong').updateOne(
{ uid: call.uid, type: 'shouchong' },
await G.mongodb.cEvent('shouchongzhigou').updateOne(
{ uid: call.uid, type: 'shouchongzhigou' },
{ $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) },
{ upsert: true }
);
@ -40,17 +43,16 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
}
export async function getShouChongRedPoint(call: ApiCall) {
let res = { show: false };
let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
// let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
//
// for (let [id, conf] of Object.entries(G.gc.shouchong)) {
// let rec = data?.receive?.[id] || [];
// if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
// if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
// res = { show: true };
// break;
// }
// }
for (let [id, conf] of Object.entries(G.gc.shouchong)) {
let rec = data?.receive?.[id] || [];
if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
res = { show: true };
break;
}
}
return res;
return {show: false};
}

3
src/module/collection_event.ts
View File

@ -26,6 +26,9 @@ export type eventType = {
shouchong: {
receive: k_v<number[]>;
};
shouchongzhigou: {
receive: k_v<number[]>;
};
kaifukuanghuan: Omit<ResOpen, 'day' | 'taskFinished'>;
dayjijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;
dengjijijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;

4
src/shared/protocols/event/shouchong/PtlOpen.ts
View File

@ -8,8 +8,10 @@ export type ReqOpen = {
};
export type ResOpen = {
payNum: number;
receive: {
[k: string]: number[];
};
buyLog:{
[k: string]: any;
}
};

20
src/shared/protocols/serviceProto.ts
View File

@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
"properties": [
{
"id": 0,
"name": "payNum",
"type": {
"type": "Number"
}
},
{
"id": 1,
"name": "receive",
"type": {
"type": "Interface",
@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
}
}
},
{
"id": 1,
"name": "buyLog",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Any"
}
}
}
}
]
},