活动:任务接口添加serverId接口

This commit is contained in:
qiaoxin
2021-05-20 19:25:52 +08:00
parent d637e5701d
commit 718f19a42a
39 changed files with 481 additions and 465 deletions
@@ -16,7 +16,7 @@ import moment = require('moment');
*/
export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -37,7 +37,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
*
*/
export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
let playerData = new MonthlyTicketData(activityData);
playerData.setPlayerRecords(playerRecord);
@@ -54,7 +54,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
*/
export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number,) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
if (!playerRecord) {//没有购买过
return null;
@@ -84,7 +84,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
*/
export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new MonthlyTicketData(activityData);
let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();