活动：修改活动bug

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

@@ -2,12 +2,12 @@ import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, FIRST_GIFT_STATE, STATUS } from '../../../consts';
 import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
-import { RoleModel } from '../../../db/Role';
-import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
-import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
 import { signInActivity, signInVIPActivity } from '../../../services/signInService';
 import { growthFundActivity } from '../../../services/growthFundService';
 import { newPlayerLimitPackageActivity } from '../../../services/limitPackageService';
+import { growthActivity } from '../../../services/growthService';
+import { dailyChallengesActivity } from '../../../services/dailyChallengesService';
+import { dailyGiftsActivity } from '../../../services/dailyGiftsService';
 
 export default function (app: Application) {
     return new ActivityHandler(app);
@@ -30,6 +30,42 @@ export class ActivityHandler {
         const serverId = session.get('serverId');
 
         let playerActivityArray = [];
+        //七天乐活动-成长任务
+        {
+            let sevenData = [];
+            let growthData = await growthActivity(serverId, roleId);
+            if (growthData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.TASK_GROWTH,
+                    activityId: growthData.activityId,
+                    data: growthData,
+                });
+            }
+            let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
+            if (dailyChallengesData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
+                    activityId: dailyChallengesData.activityId,
+                    data: dailyChallengesData,
+                });
+            }
+            let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
+            if (dailyGiftsData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
+                    activityId: dailyGiftsData.activityId,
+                    data: dailyGiftsData,
+                });
+            }
+            if (sevenData.length > 0) {
+                playerActivityArray.push({
+                    type: ACTIVITY_TYPE.SEVEN_DAY,
+                    activityId: 0,
+                    data: sevenData,
+                });
+            }
+        }
+
         //首冲礼包活动
         {
             let data = await firstGiftActivity(serverId, roleId);

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, true);
+            let activityData = await ActivityModel.findActivity(serverId, activityId);
             if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
 
             let gachaData = new GachaData(activityData);

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

@@ -91,6 +91,9 @@ export class LimitPackageHandler {
         }
 
         let item = playerData.findItem(id);
+        if (!item) {
+            return resResult(STATUS.ACTIVITY_ID_ERROR);
+        }
         if (item.countMax > 0 && item.buyCount >= item.countMax) {
             return resResult(STATUS.ACTIVITY_MAX_COUNT);
         }

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, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, 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, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
         let playerData = new SelfServiceShopData(activityData);
         let item = playerData.getItem(index);
 

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

@@ -72,7 +72,7 @@ export class SevenDaysHandler {
             return resResult(STATUS.ACTIVITY_REWARDED);
         }
 
-        await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, growthItemData.point);
+        await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1);
         let rewardParamArr: Array<RewardParam> = stringToRewardParam(growthItemData.reward);
         let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
 

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

@@ -175,7 +175,7 @@ export class orderHandler {
         orderInfo = await UserOrderModel.success(roleId, localOrderID);
         if (orderInfo) {
             //结算奖励
-            let result = await makeOrder(localOrderID, sid);
+            let result = await makeOrder(localOrderID, sid, orderInfo);
             //活动统计
             await addRechargeMoney(roleId, serverId, price);
             console.log('结算完成', localOrderID)
@@ -235,7 +235,7 @@ export class orderHandler {
         let orderInfo = await UserOrderModel.success(roleId, localOrderID);
         if (orderInfo) {
             //结算奖励
-            let result = await makeOrder(localOrderID, sid);
+            let result = await makeOrder(localOrderID, sid, orderInfo);
             //活动统计
             await addRechargeMoney(roleId, serverId, price);
             console.log(`测试支付完成!!!!!!!!!!!!!  serverId:${serverId}, productID:${productID}, roleId:${roleId}, localOrderID:${localOrderID}`)

game-server/app/services/dailyChallengesService.ts

@@ -1,8 +1,30 @@
+import { ACTIVITY_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../db/ActivityDailyChallenges';
 import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyChallengesField';
 
 
+/**
+   * 获取活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function dailyChallengesActivity(serverId: number, roleId: string) {
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+    let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityData.activityId, roleId);
+    let playerData = new DailyChallengesData(activityData);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+
 /**
    * 玩家玩家活动数据
    *
@@ -12,7 +34,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
    *
    */
 export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyChallengesData(activityData);

game-server/app/services/dailyGiftsService.ts

@@ -1,8 +1,31 @@
+import { ACTIVITY_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
 import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGiftsField';
 
 
+
+/**
+   * 获取活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function dailyGiftsActivity(serverId: number, roleId: string) {
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+    let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityData.activityId, roleId);
+    let playerData = new DailyGiftsData(activityData);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+
 /**
    * 玩家玩家活动数据
    *
@@ -12,7 +35,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
    *
    */
 export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
 
     let playerData = new DailyGiftsData(activityData);

game-server/app/services/dailyRMBGiftsService.ts

@@ -39,7 +39,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
 
     let playerData = new DailyRMBGiftsData(activityData);
     let productID = playerData.productID;
@@ -68,7 +68,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new DailyRMBGiftsData(activityData);
     let bigGiftProductID = playerData.productID;
     if (bigGiftProductID == productID) {//一次性购买7天礼包

game-server/app/services/equipService.ts

@@ -130,6 +130,7 @@ export async function dressEquip(serverId: number, roleId: string, sid: string,
     await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_BY_HERO, hero, [1]);
     await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_QUALITY, equip, [1]);
     await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
+    await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUM, 1)
 
     return { seqId: equip.seqId, hid: hero.hid };
 }

game-server/app/services/firstGiftService.ts

@@ -38,7 +38,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, 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, true);
+    let activityData = await ActivityModel.findActivity(serverId, activityId);
     if (!activityData) return false;
 
     let gachaData = new GachaData(activityData);

game-server/app/services/growthFundService.ts

@@ -43,7 +43,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId);
 
     let playerData = new GrowthFundData(activityData);

game-server/app/services/growthService.ts

@@ -12,9 +12,19 @@ import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
    * @param {string} roleId 角色Id
    *
    */
-export async function getGrowthActivityData(serverId: number, roleId: string) {
-    let activityData: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
-    return { data: activityData };
+export async function growthActivity(serverId: number, roleId: string) {
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+    let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
+    let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
+
+    let playerData = new GrowthData(activityData);
+    await playerData.setPlayerRecords(playerRecords, roleId);
+    playerData.setPlayerPointRecord(playerPointRecord);
+    return playerData;
 }
 
 /**
@@ -26,14 +36,13 @@ export async function getGrowthActivityData(serverId: number, roleId: string) {
    *
    */
 export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
-    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
     let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
 
     let playerData = new GrowthData(activityData);
-    playerData.setPlayerRecords(playerRecords);
+    await playerData.setPlayerRecords(playerRecords, roleId);
     playerData.setPlayerPointRecord(playerPointRecord);
-
     return playerData;
 }
 

game-server/app/services/limitPackageService.ts

@@ -34,7 +34,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new LimitShopData(activityData);
 
     let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);

game-server/app/services/monthlyTicketService.ts

@@ -37,7 +37,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     let playerData = new MonthlyTicketData(activityData);
     playerData.setPlayerRecords(playerRecord);
@@ -54,7 +54,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
     if (!playerRecord) {//没有购买过
         return null;
@@ -84,7 +84,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new MonthlyTicketData(activityData);
 
     let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();

game-server/app/services/orderService.ts

@@ -1,4 +1,4 @@
-import { UserOrderModel } from '../db/UserOrder';
+import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
 import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
 import { SignInData, SignInItem } from '../domain/activityField/signInField';
 import { ACTIVITY_TYPE, ORDER_STATE } from '../consts';
@@ -20,14 +20,12 @@ import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
  * 结算账单 
  * @param localOrderID 本地订单号
  */
-export async function makeOrder(localOrderID: string, sid: string) {
-    let orderInfo = await UserOrderModel.findOrder(localOrderID);
+export async function makeOrder(localOrderID: string, sid: string, orderInfo: UserOrderModelType) {
+    // let orderInfo = await UserOrderModel.findOrder(localOrderID);
     if (!orderInfo) {
         return '查无此订单';
     }
-    if (orderInfo.state == ORDER_STATE.RESULT_SUCCESS) {
-        return '结算过';
-    }
+
     //商品价格信息
     let productInfo = dicRMB.get(orderInfo.productID)
     if (!productInfo) {

game-server/app/services/popUpShopService.ts

@@ -36,7 +36,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
 
     let allPlayerShop = [];
@@ -65,7 +65,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     if (!activityData) {
         return null;
     }

game-server/app/services/rechargeMoneyService.ts

@@ -38,7 +38,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
 
     let playerData = new RechargeMoneyData(activityData);

game-server/app/services/selfServiceShopActivityService.ts

@@ -37,7 +37,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, 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

@@ -65,7 +65,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new SignInData(activityData);
     let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
 
@@ -86,7 +86,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new SignInData(activityData);
 
     await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);

game-server/app/services/thirtyDaysService.ts

@@ -39,7 +39,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 
@@ -58,7 +58,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 

game-server/app/services/treasureHuntService.ts

@@ -35,7 +35,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
 
     let playerData = new TreasureHuntData(activityData);
     playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -49,7 +49,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
 
     let playerData = new TreasureHuntData(activityData);
     playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -74,7 +74,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, true);
+        activityData = await ActivityModel.findActivity(serverId, huntActivityId);
         return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
     }
     if (now > tempData.huntEndTime) {//活动过期
@@ -83,11 +83,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, true);
+        activityData = await ActivityModel.findActivity(serverId, huntActivityId);
         return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
     }
     if (!activityData) {
-        activityData = await ActivityModel.findActivity(serverId, tempData.huntActivityId, true);
+        activityData = await ActivityModel.findActivity(serverId, tempData.huntActivityId);
     }
     return {
         huntActivityId: tempData.huntActivityId,

game-server/app/services/yuanbaoService.ts

@@ -33,7 +33,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
 
     let playerData = new YuanBaoShopData(activityData);
@@ -54,7 +54,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, true);
+    let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
     let playerData = new YuanBaoShopData(activityData);
     let item = playerData.findItem(productID);