活动：弹出礼包

game-server/app/services/activity/activityService.ts

@@ -12,7 +12,7 @@ import { getPlayerActivityData, } from './selfServiceShopActivityService';
 import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
 import moment = require('moment');
 import { getPlayerTreasureHuntData, getTreasureHuntData } from './treasureHuntService';
-import { getPlayerPopUpShopData } from './popUpShopService';
+import { getPopUpShopDataShow } from './popUpShopService';
 import { getPlayerSevenDaysData } from './sevenDaysService';
 import { getPlayerDailyMealData } from './dailyMealService';
 import { getPlayerDailyCoinData } from './dailyCoinService';
@@ -36,9 +36,10 @@ import { getPlayerLuckyTurntableDataShow } from './luckyTurntableService';
 import { getTimeLimitRankDataShow } from './timeLimitRankService';
 import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
 import { getRoleOnlineInfo } from '../redisService';
-import { addTaskPassPoint } from './taskPassService';
+import { addTaskPassPoint, getTaskPassDataShow } from './taskPassService';
 import { getGuildChannelSid } from '../chatService';
 import { getGuildPayDataShow } from './guildPayService';
+import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField';
 
 /**
    * 获取活动数据
@@ -127,7 +128,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
             }
         case ACTIVITY_TYPE.POP_UP_SHOP://弹出商店 24
             {
-                activityData = await getPlayerPopUpShopData(activityId, serverId, roleId);
+                activityData = await getPopUpShopDataShow(activityId, serverId, roleId);
                 break;
             }
         case ACTIVITY_TYPE.VIP_RECHARGE_MONEY://vip累计充值活动 26
@@ -202,6 +203,11 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
                 activityData = await getTimeLimitRankDataShow(activityId);
                 break;
             }
+        case ACTIVITY_TYPE.TASK_PASS: // 限时排行
+            {
+                activityData = await getTaskPassDataShow(activityId, serverId, roleId);
+                break;
+            }
         case ACTIVITY_TYPE.GUILD_PAY:
             {
                 activityData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
@@ -366,6 +372,7 @@ interface pushActivityParamInter {
     payMemberCnt?: number;    // 军团充值活动，你的军团充值的人数
     payMember?: string;       // 军团充值活动，充值人员名字，添加到payRecord里面
     payRecord?: string[];     // 军团全部充值人名字
+    popUpShopItems?: PopUpShopItemShow[]; // 弹出礼包
 }
 
 export interface pushActivityInter {