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

后台：增加活动名

Browse Source
This commit is contained in:
luying
2022-02-11 15:54:43 +08:00
parent 579c2ad28c
commit 22696f52c7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/gm/handler/gmHandler.ts
+3 -3
View File
@@ -157,8 +157,8 @@ export class GmHandler {
} }
} }
async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number }, session: BackendSession) { async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string }, session: BackendSession) {
const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0 } = msg; const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0, name = '' } = msg;
const uid = session.get('uid'); const uid = session.get('uid');
if (!type || !data) { if (!type || !data) {
return resResult(STATUS.WRONG_PARMS); return resResult(STATUS.WRONG_PARMS);
@@ -177,7 +177,7 @@ export class GmHandler {
let checkGroup = await checkActivityGroupTypeWithId(groupId, activities); let checkGroup = await checkActivityGroupTypeWithId(groupId, activities);
if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE); if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE);
activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, uid); activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, name, uid);
let activityServers = pinus.app.getServersByType('activity'); let activityServers = pinus.app.getServersByType('activity');
shared/db/Activity.ts
+2 -2
View File
@@ -76,13 +76,13 @@ export default class Activity extends BaseModel {
} }
//新增活动 //新增活动
public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, uid = 1) { public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string, uid = 1) {
let result: ActivityModelType[] = []; let result: ActivityModelType[] = [];
let newAids = []; let newAids = [];
for (let activityId of aids) { for (let activityId of aids) {
if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY); if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY);
newAids.push(activityId); newAids.push(activityId);
let update = { type, data, timeType, days, delayDay, interval, groupId } let update = { type, data, timeType, days, delayDay, interval, groupId, name }
if (beginTime != undefined) { if (beginTime != undefined) {
update["beginTime"] = beginTime; update["beginTime"] = beginTime;
} }
shared/db/UserOrder.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import BaseModel from './BaseModel'; import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { ORDER_STATE } from '../consts'; import { ORDER_STATE } from '../consts';
import { SearchOrderParam } from '@domain/backEndField/search'; import { SearchOrderParam } from '../domain/backEndField/search';
/** /**
* 玩家充值订单 * 玩家充值订单