活动：修改bug

shared/domain/activityField/popUpShopField.ts

@@ -1,8 +1,9 @@
+import { ACTIVITY_TYPE } from "../../consts";
 import { ActivityPopUpShopModelType } from "../../db/ActivityPopUpShop";
 
 // 弹框商店
 export class PopUpShopData {
-
+    type: number//活动类型 
     activityId: number;      // 活动id
     id: number;      // 第几个，从1开始
     name: string;           //名字
@@ -34,6 +35,7 @@ export class PopUpShopData {
 
 
     public initData(data: any) {
+        this.type = ACTIVITY_TYPE.POP_UP_SHOP;
         this.id = data.id;
         this.reward = data.reward;
         this.consume = data.consume ? data.consume : '';

shared/pubUtils/taskUtil.ts

@@ -575,6 +575,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
         for (let activity of allActivity) {
             let allTaskData: any[] = JSON.parse(activity.data);
             for (let task of allTaskData) {
+                if (task.taskType == taskType) {
                     let popShopData = new PopUpShopData(task, activity.activityId);
                     let taskRecord = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activity.activityId, roleId, popShopData.id, popShopData.taskType)
                     let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null
@@ -594,6 +595,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
                 }
             }
         }
+    }
 
     //主线成长基金
     if (taskType === TASK_TYPE.BATTLE_MAIN) {