活动存入内存中
This commit is contained in:
@@ -4,7 +4,7 @@ import { ENCRYPT_IV, ENCRYPT_KEY, STATUS, TASK_TYPE } from '../../../consts';
|
||||
import { checkActivityTask } from '../../../services/taskService';
|
||||
import { ActivityGroupModel } from '../../../db/ActivityGroup';
|
||||
import { ServerlistModel } from '../../../db/Serverlist';
|
||||
import { getActivity } from '../../../services/activity/activityService';
|
||||
import { getActivity, getActivityById } from '../../../services/activity/activityService';
|
||||
import { ActivityModel } from '../../../db/Activity';
|
||||
|
||||
export default function (app: Application) {
|
||||
@@ -39,7 +39,7 @@ export class ActivityHandler {
|
||||
for (let groupData of groups) {
|
||||
let playerGroupActivityArray = [];
|
||||
for (let activityId of groupData.activities) {
|
||||
let activityData = await ActivityModel.findActivity(activityId);
|
||||
let activityData = await getActivityById(activityId);
|
||||
if (activityData) {
|
||||
let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type)
|
||||
if (playerActivityData) playerGroupActivityArray.push(playerActivityData);
|
||||
|
||||
@@ -13,6 +13,7 @@ import { UserGachaRecModel } from "../../../db/UserGachaRec";
|
||||
import { ActivityModel } from "../../../db/Activity";
|
||||
import { checkActivityTask, checkTask } from "../../../services/taskService";
|
||||
import { RECRUIT } from "../../../pubUtils/dicParam";
|
||||
import { getActivityById } from "../../../services/activity/activityService";
|
||||
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
@@ -238,7 +239,7 @@ export class GachaHandler {
|
||||
|
||||
let heroes: number[] = [];
|
||||
if (gachaId == GACHA_ID.TIMELIMIT) {
|
||||
let activityData = await ActivityModel.findActivity(activityId);
|
||||
let activityData = await getActivityById(activityId);
|
||||
if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
|
||||
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
|
||||
@@ -9,6 +9,7 @@ import { addReward, stringToRewardParam } from '../../../services/activity/giftP
|
||||
import { RewardParam } from '../../../domain/activityField/rewardField';
|
||||
import { handleCost } from '../../../services/rewardService';
|
||||
import moment = require('moment');
|
||||
import { getActivityById } from '../../../services/activity/activityService';
|
||||
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
@@ -54,7 +55,7 @@ export class PopUpShopHandler {
|
||||
|
||||
let beginTime = moment(beginTimeStamp).toDate();
|
||||
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let activityData: ActivityModelType = await getActivityById(activityId);
|
||||
if (!activityData) {
|
||||
return resResult(STATUS.ACTIVITY_MISSING);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayer
|
||||
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
|
||||
import { random } from 'underscore';
|
||||
import { RoleModel } from '../../../db/Role';
|
||||
import { getActivityById } from '../../../services/activity/activityService';
|
||||
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
@@ -54,7 +55,7 @@ export class SelfServiceShopHandler {
|
||||
const roleName = session.get('roleName');
|
||||
|
||||
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let activityData = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SelfServiceShopData(activityData, createTime);
|
||||
let item = playerData.getItem(index);
|
||||
@@ -114,7 +115,7 @@ export class SelfServiceShopHandler {
|
||||
const roleName = session.get('roleName');
|
||||
|
||||
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let activityData: ActivityModelType = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SelfServiceShopData(activityData, createTime);
|
||||
let unitPrice = playerData.unitPrice;//购买价格
|
||||
|
||||
Reference in New Issue
Block a user