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

后台：活动类型表

Browse Source
This commit is contained in:
luying
2021-06-17 17:19:51 +08:00
parent 703a128811
commit 46595fcbed
10 changed files with 194 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gm-server/app/controller/activity.ts
View File

@@ -33,6 +33,13 @@ export default class ActivityController extends Controller {
return
}
public async getActivityGroupTypeList() {
const { ctx } = this;
const { page, pageSize, sortField, sortOrder, groupType, groupTypeName } = ctx.request.body;
ctx.body = await ctx.service.activity.getActivityGroupTypeList(page, pageSize, sortField, sortOrder, groupType, groupTypeName);
return
}
public async updateActivityGroupName() {
const { ctx } = this;
const { groupId, groupName } = ctx.request.body;

1
gm-server/app/router.ts
View File

@@ -66,5 +66,6 @@ export default (app: Application) => {
router.post('/api/activity/savegrouptoserver', tokenParser, controller.activity.saveGroupToServer);
router.post('/api/activity/creategroup', tokenParser, controller.activity.createGroup);
router.post('/api/activity/deletegroup', tokenParser, controller.activity.deleteGroup);
router.post('/api/activity/getactivitygrouptypelist', controller.activity.getActivityGroupTypeList);
};

20
gm-server/app/service/Activity.ts
View File

@@ -5,6 +5,7 @@ import { ActivityGroupModel } from '@db/ActivityGroup';
import { ServerlistModel } from '@db/Serverlist';
import { GMUserType } from '@db/GMUser';
import { SignInData } from '@domain/activityField/signInField';
import { ActivityGroupTypeModel } from '@db/ActivityGroupType';
/**
* Test Service
@@ -110,7 +111,7 @@ export default class Activity extends Service {
public async updateActivityGroupName(groupId: number, groupName: string) {
const { ctx } = this;
try {
await ActivityGroupModel.updateGroupName(groupId, groupName);
await ActivityGroupModel.updateGroupName(groupId, groupName, ctx.user?.uid);
} catch(e) {
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, e.stack);
}
@@ -147,7 +148,7 @@ export default class Activity extends Service {
}
await ServerlistModel.updateActivityGroup(server._id, pushArr, pullArr);
}
await ActivityGroupModel.updateServerData(groupId, serverIds);
await ActivityGroupModel.updateServerData(groupId, serverIds, ctx.user?.uid);
} catch(e) {
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, e.stack);
}
@@ -160,7 +161,7 @@ export default class Activity extends Service {
public async createGroup() {
const { ctx } = this;
try {
await ActivityGroupModel.createGroup();
await ActivityGroupModel.createGroup(ctx.user?.uid);
} catch(e) {
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, e.stack);
}
@@ -182,5 +183,18 @@ export default class Activity extends Service {
}
return ctx.service.utils.resResult(STATUS.SUCCESS)
}
/**
* 获得活动组类型列表
*/
public async getActivityGroupTypeList(page: number, pageSize: number, sortField: string, sortOrder: string, groupType: number, groupTypeName: string) {
const { ctx } = this;
// console.log('***', page, pageSize, type, serverId, current, activityId)
const list = await ActivityGroupTypeModel.findByCondition(page, pageSize, sortField, sortOrder, { groupType, groupTypeName });
const total = await ActivityGroupTypeModel.countByCondition({ groupType, groupTypeName });
return ctx.service.utils.resResult(STATUS.SUCCESS, {
list, total
});
}
}