活动：成长基金添加购买记录

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

@@ -52,6 +52,10 @@ export class SevenDaysHandler {
         let playerData = await getPlayerGrowthFundData(activityId, serverId, roleId)
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
 
+        if (playerData.isVipActivity() && !playerData.isBuy(pageIndex)) {//vip高阶活动，需要购买
+            return resResult(STATUS.ACTIVITY_NEED_BUY);
+        }
+
         let growthFundItemData: GrowthFundItem = playerData.findGrowthFundItem(pageIndex, cellIndex);
         if (!growthFundItemData) {
             return resResult(STATUS.ACTIVITY_DATA_ERROR);

game-server/app/services/growthFundService.ts

@@ -1,6 +1,7 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../db/ActivityGrowthFund';
+import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../db/ActivityBuyRecords';
 import { RoleModel } from '../db/Role';
 import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFundField';
 
@@ -12,8 +13,17 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
    * @param {string} roleId 角色Id
    *
    */
+/*ACTIVITY_TYPE类型
+  GROWTH_FUND_MAIN = 6, // 主线成长基金
+  GROWTH_FUND_MAIN_VIP = 7, // 主线成长基金（高阶）
+  GROWTH_FUND_TOWER = 8, // 镇念塔成长基金
+  GROWTH_FUND_TOWER_VIP = 9, // 镇念塔成长基金（高阶）
+  GROWTH_FUND_MAIN_ELITE = 10, // 精英成长基金
+  GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
+*/
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await (await ActivityModel.findActivityByType(type, true)).sort((a, b) => {
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
+    activityArray = activityArray.sort((a, b) => {
         return a.acvitityId - b.acvitityId
     });
     for (let i = 0; i < activityArray.length; i++) {
@@ -40,6 +50,10 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
 
     let playerData = new GrowthFundData(activityData);
     playerData.setPlayerRecords(playerRecords);
+    if (playerData.isVipActivity()) {//vip高阶需要购买
+        let buyRecords = await ActivityBuyRecordsModel.findRecordsByActivityId(activityData.acvitityId, roleId);
+        playerData.initBuyRecords(buyRecords);
+    }
 
     let activityType = activityData.type;
     switch (activityType) {