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-20 19:25:52 +08:00
parent d637e5701d
commit 718f19a42a
39 changed files with 481 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gm-server/app/service/Activity.ts
+11 -9
View File
@@ -16,32 +16,34 @@ export default class Activity extends Service {
const list = await ActivityModel.findByCondition(page, pageSize, type, serverId, current, activityId);
const total = await ActivityModel.countByCondition(type, serverId, current, activityId);
return ctx.service.utils.resResult(STATUS.SUCCESS, {
list: list.map(cur => { return {
...cur, beginTime: cur.beginTime.getTime(), endTime: cur.endTime.getTime()
} }), total
list: list.map(cur => {
return {
...cur, beginTime: cur.beginTime.getTime(), endTime: cur.endTime.getTime()
}
}), total
});
}
public async updateActivity(activityId: number|string, serverId: number, beginTime: number, endTime: number, type: number, data: string) {
public async updateActivity(activityId: number | string, serverId: number, beginTime: number, endTime: number, type: number, data: string) {
const { ctx } = this;
if(!type || !data) {
if (!type || !data) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
try {
let result = JSON.parse(data);
ctx.service.utils.checkActivityData(result, type);
} catch(e) {
} catch (e) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let aids: number[] = [];
if(typeof activityId == 'number') {
if (typeof activityId == 'number') {
aids.push(activityId);
} else {
activityId.split(',').forEach(aidStr => {
aids.push(parseInt(aidStr));
});
}
const activity = await ActivityModel.addActivity(aids, serverId, beginTime?new Date(beginTime): undefined, endTime?new Date(endTime): undefined, type, data);
const activity = await ActivityModel.addActivity(aids, serverId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data);
return ctx.service.utils.resResult(STATUS.SUCCESS, {
activity
})
@@ -50,7 +52,7 @@ export default class Activity extends Service {
public async deleteActivity(activityId: number) {
const { ctx } = this;
const result = await ActivityModel.deleteActivity(activityId);
if(result) {
if (result) {
return ctx.service.utils.resResult(STATUS.SUCCESS);
} else {
return ctx.service.utils.resResult(STATUS.ACTIVITY_MISSING);