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

10
game-server/app/services/dailyRMBGiftsService.ts
View File

@@ -7,6 +7,7 @@ import moment = require('moment');
import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
import { RewardParam } from '../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ServerlistModel } from '../db/Serverlist';
/**
* 获取活动数据
@@ -17,8 +18,9 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
export async function dailyGiftsActivity(type: number, serverId: number, roleId: string) {
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 getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new DailyRMBGiftsData(activityData);
let productID = playerData.productID;
@@ -68,7 +70,7 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
*/
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new DailyRMBGiftsData(activityData);
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包