活动：删除serverId相关查询

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -266,7 +266,7 @@ export class GachaHandler {
 
         let heroes: number[] = [];
         if (gachaId == GACHA_ID.TIMELIMIT) {
-            let activityData = await ActivityModel.findActivity(serverId, activityId);
+            let activityData = await ActivityModel.findActivity(activityId);
             if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
 
             let gachaData = new GachaData(activityData);

game-server/app/servers/activity/handler/popUpShopHandler.ts

@@ -51,7 +51,7 @@ export class PopUpShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
         if (!activityData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }

game-server/app/servers/activity/handler/selfServiceShopHandler.ts

@@ -50,7 +50,7 @@ export class SelfServiceShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
         let playerData = new SelfServiceShopData(activityData);
         let item = playerData.getItem(index);
 

game-server/app/servers/activity/handler/thirtyDaysHandler.ts

@@ -8,6 +8,7 @@ import { ActivityThirtyDaysModel } from '../../../db/ActivityThirtyDays';
 import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDaysPointReward';
 import moment = require('moment');
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
+import { ServerlistModel } from '../../../db/Serverlist';
 
 export default function (app: Application) {
     return new ThirtyDaysHandler(app);
@@ -54,8 +55,8 @@ export class ThirtyDaysHandler {
         const funcs: number[] = session.get('funcs');
 
         let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
-
+        let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
+        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.THIRTY_DAYS, 1)
 
         let activityDays = 0;
         for (let i = 0; i < activityArray.length; i++) {

game-server/app/servers/order/handler/orderHandler.ts

@@ -9,6 +9,7 @@ import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
 import { makeOrder } from '../../../services/orderService';
 import { addRechargeMoney } from '../../../services/rechargeMoneyService';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
+import { ServerlistModel } from '../../../db/Serverlist';
 
 export default function (app: Application) {
     return new orderHandler(app);
@@ -223,7 +224,8 @@ export class orderHandler {
         let orderID = '';//平台订单号
         let sdkOrderInfo = null;//客户端需要的平台订单信息
 
-        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, productType, -1);
+        let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, productType, -1);
         if (activityArray.length === 0) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }

game-server/app/services/dailyChallengesService.ts

@@ -36,7 +36,7 @@ export async function dailyChallengesActivity(serverId: number, roleId: string)
    *
    */
 export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyChallengesData(activityData);

game-server/app/services/dailyGiftsService.ts

@@ -37,7 +37,7 @@ export async function dailyGiftsActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyGiftsData(activityData);

game-server/app/services/dailyRMBGiftsService.ts

@@ -7,6 +7,7 @@ import moment = require('moment');
 import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from './giftPackageService';
+import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据
@@ -17,8 +18,9 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    *
    */
 
-export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
+export async function dailyGiftsActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, type, 1)
 
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
@@ -39,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
 
     let playerData = new DailyRMBGiftsData(activityData);
     let productID = playerData.productID;
@@ -68,7 +70,7 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
    */
 export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new DailyRMBGiftsData(activityData);
     let bigGiftProductID = playerData.productID;
     if (bigGiftProductID == productID) {//一次性购买7天礼包

game-server/app/services/firstGiftService.ts

@@ -1,6 +1,7 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
+import { ServerlistModel } from '../db/Serverlist';
 import { FirstGiftData } from '../domain/activityField/firstGiftField';
 
 /**
@@ -13,7 +14,8 @@ import { FirstGiftData } from '../domain/activityField/firstGiftField';
    */
 
 export async function firstGiftActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, 1)
 
     if (activityArray.length == 0) {
         return null;
@@ -38,7 +40,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
 
     let playerData = new FirstGiftData(activityData);

game-server/app/services/gachaService.ts

@@ -15,7 +15,7 @@ import { gameData, getDicGachaFloor } from "../pubUtils/data";
  */
 export async function getLimitGacha(serverId: number, roleId: string, activityId: number) {
 
-    let activityData = await ActivityModel.findActivity(serverId, activityId);
+    let activityData = await ActivityModel.findActivity(activityId);
     if (!activityData) return false;
 
     let gachaData = new GachaData(activityData);

game-server/app/services/growthFundService.ts

@@ -45,7 +45,7 @@ export async function growthFundActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerGrowthFundData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId);
 
     let playerData = new GrowthFundData(activityData);

game-server/app/services/growthService.ts

@@ -38,7 +38,7 @@ export async function growthActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
     let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
 

game-server/app/services/limitPackageService.ts

@@ -36,7 +36,7 @@ export async function newPlayerLimitPackageActivity(serverId: number, roleId: st
    *
    */
 export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new LimitShopData(activityData);
 
     let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);

game-server/app/services/monthlyTicketService.ts

@@ -39,7 +39,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
    *
    */
 export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     let playerData = new MonthlyTicketData(activityData);
     playerData.setPlayerRecords(playerRecord);
@@ -56,7 +56,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
    */
 export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number,) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     if (!playerRecord) {//没有购买过
         return null;
@@ -86,7 +86,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
    */
 export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new MonthlyTicketData(activityData);
 
     let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();

game-server/app/services/popUpShopService.ts

@@ -38,7 +38,7 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
 
     let allPlayerShop = [];
@@ -67,7 +67,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
    */
 export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     if (!activityData) {
         return null;
     }

game-server/app/services/rechargeMoneyService.ts

@@ -40,7 +40,7 @@ export async function rechargeMoneyActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
 
     let playerData = new RechargeMoneyData(activityData);

game-server/app/services/selfServiceShopActivityService.ts

@@ -39,7 +39,7 @@ export async function getActivityData(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerActivityData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new SelfServiceShopData(activityData);
 
     let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);

game-server/app/services/signInService.ts

@@ -68,7 +68,7 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new SignInData(activityData);
     let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
 
@@ -89,7 +89,7 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
    */
 export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new SignInData(activityData);
 
     await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);

game-server/app/services/thirtyDaysService.ts

@@ -7,6 +7,7 @@ import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelT
 import Role, { RoleModel } from '../db/Role';
 import moment = require('moment');
 import { deltaDays } from '../pubUtils/util';
+import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据
@@ -18,7 +19,8 @@ import { deltaDays } from '../pubUtils/util';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, type, 1)
 
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
@@ -39,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
    *
    */
 export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 
@@ -58,7 +60,7 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
    *
    */
 export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 

game-server/app/services/treasureHuntService.ts

@@ -2,6 +2,7 @@ import moment = require('moment');
 import { ACTIVITY_TYPE, SERVER_OPEN_TIME, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityTreasureHuntShopModel, ActivityTreasureHuntShopModelType } from '../db/ActivityTreasureHuntShop';
+import { ServerlistModel } from '../db/Serverlist';
 import { ServerTempModel, ServerTempModelType } from '../db/ServerTemp';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { TreasureHuntData } from '../domain/activityField/treasureHuntField';
@@ -35,7 +36,7 @@ export async function treasureHuntActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerTreasureHuntData(activityId: number, serverId: number, roleId: string, huntRoundIndex: number, huntBeginTime: Date, huntEndTime: Date) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
 
     let playerData = new TreasureHuntData(activityData);
     playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -49,7 +50,7 @@ export async function getPlayerTreasureHuntData(activityId: number, serverId: nu
 }
 
 export async function getPlayerTreasureHuntShopData(activityId: number, serverId: number, roleId: string, huntRoundIndex: number, huntBeginTime: Date, huntEndTime: Date) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
 
     let playerData = new TreasureHuntData(activityData);
     playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -74,7 +75,7 @@ export async function getTreasureHuntData(serverId: number) {
             return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
         }
         tempData = await ServerTempModel.updateTreasureHuntData(serverId, huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex);
-        activityData = await ActivityModel.findActivity(serverId, huntActivityId);
+        activityData = await ActivityModel.findActivity(huntActivityId);
         return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
     }
     if (now > tempData.huntEndTime) {//活动过期
@@ -83,11 +84,11 @@ export async function getTreasureHuntData(serverId: number) {
             return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
         }
         tempData = await ServerTempModel.updateTreasureHuntData(serverId, huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex);
-        activityData = await ActivityModel.findActivity(serverId, huntActivityId);
+        activityData = await ActivityModel.findActivity(huntActivityId);
         return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
     }
     if (!activityData) {
-        activityData = await ActivityModel.findActivity(serverId, tempData.huntActivityId);
+        activityData = await ActivityModel.findActivity(tempData.huntActivityId);
     }
     return {
         huntActivityId: tempData.huntActivityId,
@@ -99,10 +100,11 @@ export async function getTreasureHuntData(serverId: number) {
 }
 
 async function getNewActivityData(serverId: number) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
     let huntActivityId: number = 0;				// 寻宝骑兵-活动Id
     let huntEndTime: Date = null;					// 寻宝骑兵-结束时间
     let huntRoundIndex: number = 0;				// 寻宝骑兵-周期数
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
     let treasureHuntDataArray: TreasureHuntData[] = [];
     for (let obj of activityArray) {
         treasureHuntDataArray.push(new TreasureHuntData(obj));
@@ -130,10 +132,11 @@ async function getNewActivityData(serverId: number) {
 }
 
 async function getNextActivityData(serverId: number, oldHuntActivityId: number, oldHuntEndTime: Date, oldHuntRoundIndex: number) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
     let huntActivityId: number = 0;				// 寻宝骑兵-活动Id
     let huntEndTime: Date = null;					// 寻宝骑兵-结束时间
     let huntRoundIndex: number = oldHuntRoundIndex;				// 寻宝骑兵-周期数
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
     let treasureHuntDataArray: TreasureHuntData[] = [];
     for (let obj of activityArray) {
         treasureHuntDataArray.push(new TreasureHuntData(obj));

game-server/app/services/yuanbaoService.ts

@@ -1,5 +1,6 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ServerlistModel } from '../db/Serverlist';
 import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { YuanBaoShopData, YuanBaoShopItem } from '../domain/activityField/yuanBaoShopField';
@@ -15,7 +16,8 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function yuanbaoActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
     if (activityArray.length == 0) {
         return null;
     }
@@ -33,7 +35,7 @@ export async function yuanbaoActivity(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerYuanbaoShopData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
 
     let playerData = new YuanBaoShopData(activityData);
@@ -54,7 +56,7 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
 export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
     let records = await UserOrderModel.findOrderByProductID(productID, roleId, activityId);
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     let playerData = new YuanBaoShopData(activityData);
     let item = playerData.findItem(productID);
 

shared/db/Activity.ts

@@ -31,14 +31,14 @@ export default class Activity extends BaseModel {
     }
 
     //根据活动类型查询活动数据
-    public static async findActivityByType(serverId: number, type: number, sort: number) {
+    public static async findActivityByType(activityGroupId: number[], type: number, sort: number) {
-        let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).sort({ activityId: sort }).lean(true);
+        let result: ActivityModelType[] = await ActivityModel.find({ groupId: { $in: activityGroupId }, type }).sort({ activityId: sort }).lean(true);
         return result;
     }
 
     //根据活动id查询活动数据
-    public static async findActivity(serverId: number, activityId: number) {
+    public static async findActivity(activityId: number) {
-        let result: ActivityModelType = await ActivityModel.findOne({ serverId, activityId }).lean(true);
+        let result: ActivityModelType = await ActivityModel.findOne({ activityId }).lean(true);
         return result;
     }