活动:修改获取活动逻辑,从serverlist上剥离
This commit is contained in:
@@ -4,7 +4,7 @@ import { ActivityVipRechargeMoneyModel, ActivityVipRechargeMoneyModelType } from
|
||||
import { VipRechargeMoneyData } from '../../domain/activityField/vipRechargeMoneyField';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { getActivityById } from './activityService';
|
||||
import { getActivitiesByType, getActivityById } from './activityService';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
|
||||
/**
|
||||
@@ -17,8 +17,7 @@ import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
*/
|
||||
|
||||
export async function vipRechargeMoneyActivity(serverId: number, roleId: string) {
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY, new Date())
|
||||
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY);
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -65,8 +64,7 @@ export async function getPlayerVipRechargeMoneyData(activityId: number, serverId
|
||||
*
|
||||
*/
|
||||
export async function addVipRechargeMoney(roleId: string, serverId: number, RMB: number) {
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY, new Date())
|
||||
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.VIP_RECHARGE_MONEY);
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user