xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：删除serverId相关查询

Browse Source
This commit is contained in:
qiaoxin
2021-05-26 18:01:47 +08:00
parent ebb9870855
commit d174ac5ff6
22 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
game-server/app/services/thirtyDaysService.ts
View File

@@ -7,6 +7,7 @@ import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelT
import Role, { RoleModel } from '../db/Role';
import moment = require('moment');
import { deltaDays } from '../pubUtils/util';
import { ServerlistModel } from '../db/Serverlist';
/**
* 获取活动数据
@@ -18,7 +19,8 @@ import { deltaDays } from '../pubUtils/util';
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, type, 1)
let allPlayerActivity = [];
for (let i = 0; i < activityArray.length; i++) {
@@ -39,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
*
*/
export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
@@ -58,7 +60,7 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
*
*/
export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);