活动：任务积分支持多活动id

game-server/app/servers/role/handler/taskHandler.ts

@@ -10,7 +10,7 @@ import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dic
 import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask } from "../../../services/taskService";
 import { TASK } from "../../../pubUtils/dicParam";
 import { newHeroGiftPoint } from "../../../services/activity/newHeroGiftsService";
-import { ActivityTaskPointModel } from "../../../db/ActivityTaskPoint";
+import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
 import { ItemInter } from "../../../pubUtils/interface";
 import { RoleModel } from "../../../db/Role";
 import { roleLevelup } from "../../../services/normalBattleService";
@@ -71,11 +71,11 @@ export class ShopHandler {
         }
 
         //任务完成后关联活动的积分
-        let activityTaskPoint = await ActivityTaskPointModel.findData(type, id);
-        if (activityTaskPoint) {
-            await newHeroGiftPoint(serverId, activityTaskPoint.activityId, roleId, activityTaskPoint.point);
+        let activityTaskPoint: ActivityTaskPointModelType[] = await ActivityTaskPointModel.findData(type, id);
+        for (let obj of activityTaskPoint) {
+            await newHeroGiftPoint(serverId, obj.activityId, roleId, obj.point);
             let uids = [{ uid: roleId, sid }];
-            this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: activityTaskPoint.activityId, addPoint: point }), uids);
+            this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: obj.activityId, addPoint: point }), uids);
         }
 
         let goods = await addItems(roleId, roleName, sid, taskReward);

shared/db/ActivityTaskPoint.ts

@@ -29,7 +29,7 @@ export default class Activity_Task_Point extends BaseModel {
 
     //查询数据
     public static async findData(taskType: number, taskId: number) {
-        let result: ActivityTaskPointModelType = await ActivityTaskPointModel.findOne(
+        let result: ActivityTaskPointModelType[] = await ActivityTaskPointModel.find(
             { taskType, taskId }).lean(true);
         return result;
     }