活动：30天任务减少查询

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

@@ -6,7 +6,7 @@ import { getPlayerLimitPackageData, } from './limitPackageService';
 import { getPlayerYuanbaoShopData, } from './yuanbaoService';
 import { getPlayerMonthlyTicketData, } from './monthlyTicketService';
 import { getPlayerRechargeMoneyDataShow, } from './rechargeMoneyService';
-import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays, } from './thirtyDaysService';
+import { getPlayerThirtyDaysData } from './thirtyDaysService';
 import { getPlayerVipRechargeMoneyData, } from './vipRechargeMoneyService';
 import { getPlayerActivityData, } from './selfServiceShopActivityService';
 import { ActivitySelfServiceGoodsModel } from '../../db/ActivitySelfServiceGoods';
@@ -73,8 +73,9 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
         case ACTIVITY_TYPE.THIRTY_DAYS://30天目标活动 12
             {
                 let data = await getPlayerThirtyDaysData(activityId, serverId, roleId);
-                let todayIndex = await playerThirtyDaysActivityDays(roleId);
-                activityData = { playerData: data, todayIndex, canShow: () => data.canShow }
+                if(data.canShow()) {
+                    activityData = { playerData: data, todayIndex: data.todayIndex }
+                }
                 break;
             }
         case ACTIVITY_TYPE.SELF_SERVICE_SHOP://自选商店 糜家商队 13

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

@@ -1,11 +1,6 @@
-import { ActivityModel, ActivityModelType } from '../../db/Activity';
 import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../../db/ActivityThirtyDays';
 import { ThirtyDaysData } from '../../domain/activityField/thirtyDaysField';
 import { ActivityThirtyDaysPointRewardModel, ActivityThirtyDaysPointRewardModelType } from '../../db/ActivityThirtyDaysPointReward';
-import { RoleModel } from '../../db/Role';
-import moment = require('moment');
-import { deltaDays } from '../../pubUtils/util';
-import { ServerlistModel } from '../../db/Serverlist';
 import { getActivitiesByType, getActivityById } from './activityService';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
 
@@ -74,22 +69,4 @@ export async function addPlayerThirtyDaysTask(activityId: number, serverId: numb
     playerData.setPlayerRecords(playerRecords);
     playerData.setPlayerPointRecords(playerPointRecords);
     return playerData;
-}
-
-/**
-   * 玩家活动第几天
-   *
-   * @param {number} serverId 区Id
-   * @param {number} activityId 活动Id
-   * @param {string} roleId 角色Id
-   *
-   */
-export async function playerThirtyDaysActivityDays(roleId: string) {
-    let { createTime } = await RoleModel.findByRoleId(roleId);
-    let createDate = moment(createTime * 1000).toDate();
-    let todayIndex = deltaDays(moment(createDate).startOf('d').toDate(), new Date) + 1;
-    return todayIndex;
-}
-{
-
 }