diff --git a/gm-server/app/controller/activity.ts b/gm-server/app/controller/activity.ts index 5452c73a8..7b9159ef5 100644 --- a/gm-server/app/controller/activity.ts +++ b/gm-server/app/controller/activity.ts @@ -89,8 +89,8 @@ export default class ActivityController extends Controller { public async updateActivityTaskPoint() { const { ctx } = this; - const { taskType, taskId, activityId, point } = ctx.request.body; - ctx.body = await ctx.service.activity.updateActivityTaskPoint(taskType, taskId, activityId, point); + const { type, taskId, activityId, point, taskType, activityType } = ctx.request.body; + ctx.body = await ctx.service.activity.updateActivityTaskPoint(type, taskId, activityId, activityType, taskType, point); return } diff --git a/gm-server/app/service/Activity.ts b/gm-server/app/service/Activity.ts index ffb6f8c1f..c5ae3c940 100644 --- a/gm-server/app/service/Activity.ts +++ b/gm-server/app/service/Activity.ts @@ -177,9 +177,9 @@ export default class Activity extends Service { return ctx.service.utils.resResult(STATUS.SUCCESS); } - public async updateActivityTaskPoint(taskType: number, taskId: number, activityId: number, point: number) { + public async updateActivityTaskPoint(type: number, taskId: number, activityId: number, activityType: number, taskType: number, point: number) { const { ctx } = this; - let result = await ActivityTaskPointModel.updateData(taskType, taskId, activityId, point, ctx.user?.uid); + let result = await ActivityTaskPointModel.updateData(type, taskId, activityId, activityType, taskType, point, ctx.user?.uid); if(!result) return ctx.service.utils.resResult(STATUS.WRONG_PARMS); return ctx.service.utils.resResult(STATUS.SUCCESS); } diff --git a/shared/db/ActivityTaskPoint.ts b/shared/db/ActivityTaskPoint.ts index e990efff8..fc64933d4 100644 --- a/shared/db/ActivityTaskPoint.ts +++ b/shared/db/ActivityTaskPoint.ts @@ -25,9 +25,9 @@ export default class Activity_Task_Point extends BaseModel { point: number; // 增加点数 //更新活动数据 - public static async updateData(type: number, taskId: number, activityId: number, point: number, uid = 1) { + public static async updateData(type: number, taskId: number, activityId: number, activityType: number, taskType: number, point: number, uid = 1) { let result: ActivityTaskPointModelType = await ActivityTaskPointModel.findOneAndUpdate( - { type, taskId, activityId }, { $set: { point, updatedBy: uid }, $setOnInsert: { createdBy: uid } }, { upsert: true, new: true } + { type, taskId, activityId }, { $set: { activityType, taskType, point, updatedBy: uid }, $setOnInsert: { createdBy: uid } }, { upsert: true, new: true } ).lean(true); return result; } diff --git a/shared/db/ServerStategy.ts b/shared/db/ServerStategy.ts index 36dc58c10..da7cb2bf0 100644 --- a/shared/db/ServerStategy.ts +++ b/shared/db/ServerStategy.ts @@ -80,8 +80,16 @@ export default class ServerStategy { this.timers = stategy.timers; this.activityGroupId = stategy.activityGroupId; this.stopRegisterTime = stategy.stopRegisterTime; - if(stategy.hasCircleMail) this.circleMail = stategy.circleMail; - if(stategy.hasOpenMail) this.openMail = stategy.openMail; + if(stategy.hasCircleMail) { + this.circleMail = stategy.circleMail; + } else { + this.circleMail = null; + } + if(stategy.hasOpenMail) { + this.openMail = stategy.openMail; + } else { + this.openMail = null; + } } } export interface ServerStategyType extends Pick, keyof ServerStategy> { };