活动：修改限购商店的刷新时间为5点

game-server/app/services/limitPackageService.ts

@@ -1,11 +1,13 @@
+import moment = require('moment');
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityShopModel, ActivityShopModelType } from '../db/ActivityShop';
+import { RoleModel } from '../db/Role';
 import { ServerlistModel } from '../db/Serverlist';
 import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField';
 
 /**
-   * 获取新手玩家限购礼包活动数据
+   * 获取新手玩家限购礼包活动数据  新手限定作为开服七天乐的延伸礼包。只存在于开服前七天，七天时间过去，玩家无法购买
    *
    * @param {number} serverId 区Id
    * @param {number} type 活动类型 ACTIVITY_TYPE
@@ -14,6 +16,9 @@ import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField'
    */
 
 export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) {
+    let { createTime } = await RoleModel.findByRoleId(roleId);
+    let createDate = moment(createTime * 1000).toDate();
+
     let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
     let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
     if (activityArray.length == 0) {

game-server/app/services/rechargeMoneyService.ts

@@ -20,15 +20,19 @@ import { ServerlistModel } from '../db/Serverlist';
 export async function rechargeMoneyActivity(serverId: number, roleId: string) {
     let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
     let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
-    activityArray = activityArray.sort((a, b) => {
-        return b.activityId - a.activityId
-    });
-    let playerDataArray = [];
-    for (let activityData of activityArray) {
-        let playerData = await getPlayerRechargeMoneyData(activityData.activityId, serverId, roleId);
-        playerDataArray.push(playerData)
-    }
-    return playerDataArray
+
+    let activityData = activityArray[0];
+    let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
+    let playerData = new RechargeMoneyData(activityData);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+
+    // let playerDataArray = [];
+    // for (let activityData of activityArray) {
+    //     let playerData = await getPlayerRechargeMoneyData(activityData.activityId, serverId, roleId);
+    //     playerDataArray.push(playerData)
+    // }
+    // return playerDataArray
 }
 
 /**