xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：糜家商店挑战统计

Browse Source
This commit is contained in:
qiaoxin
2021-06-09 17:07:35 +08:00
parent 9209378b9d
commit 7ed630f85e
7 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
game-server/app/services/selfServiceShopActivityService.ts
View File

@@ -1,4 +1,4 @@
import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, STATUS } from '../consts';
import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, REFRESH_TIME, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../db/ActivitySelfServiceGoods';
import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../db/ActivitySelfServiceShop';
@@ -8,6 +8,7 @@ import { RewardParam } from '../domain/activityField/rewardField';
import { SelfServiceShopData, SelfServiceShopItem } from '../domain/activityField/selfServiceShopField';
import { gameData } from '../pubUtils/data';
import { addReward, getSelectedReward } from './giftPackageService';
import moment = require('moment');
/**
* 获取活动数据
@@ -17,7 +18,7 @@ import { addReward, getSelectedReward } from './giftPackageService';
* @param {string} roleId 角色Id
*
*/
export async function getActivityData(serverId: number, roleId: string) {
export async function getSelfServiceShopActivityData(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
activityArray = activityArray.sort((a, b) => {
@@ -49,6 +50,25 @@ export async function getPlayerActivityData(activityId: number, serverId: number
let playerSelfServerData = await ActivitySelfServiceModel.findData(serverId, activityId, roleId, playerData.roundIndex);
let buyCount = (playerSelfServerData && playerSelfServerData.unitBuyCount) ? playerSelfServerData.unitBuyCount : 0;
playerData.unitBuyCount = buyCount;
let challengeBeginTime = null;
let challengeEndTime = null;
let curDate = moment(new Date());
if (curDate.hour() < REFRESH_TIME) {
challengeBeginTime = moment(new Date()).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
challengeEndTime = moment(challengeBeginTime).add(1, 'd').toDate()
} else {
console.log("dddddddddddddddd", curDate.hour(), curDate.hours())
challengeBeginTime = moment(new Date()).startOf('d').add(REFRESH_TIME, 'h').toDate();
challengeEndTime = moment(challengeBeginTime).add(1, 'd').toDate()
}
console.log("dddddddddddddddd", challengeBeginTime, challengeEndTime)
let records = (playerSelfServerData && playerSelfServerData.challengeRecords) ? playerSelfServerData.challengeRecords : [];
for (let record of records) {
console.log(challengeBeginTime, challengeEndTime, record.time)
if (record.time >= challengeBeginTime && record.time <= challengeEndTime) {
playerData.challengeCount++;
}
}
return playerData;
}