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

活动：特惠礼包

Browse Source
This commit is contained in:
luying
2022-05-19 21:44:39 +08:00
parent 20c63a46d4
commit e0b4799220
6 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
game-server/app/services/activity/dailyRMBGiftsService.ts
View File

@@ -5,8 +5,6 @@ import { DailyRMBGiftsData } from '../../domain/activityField/dailyRMBGiftsField
import moment = require('moment');
import { RewardParam } from '../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from './giftPackageService';
import { ServerlistModel } from '../../db/Serverlist';
import { RoleModel } from '../../db/Role';
import { getActivitiesByType, getActivityById } from './activityService';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
@@ -42,18 +40,9 @@ export async function getPlayerDailyRMBGiftsData(activityId: number, serverId: n
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new DailyRMBGiftsData(activityData, createTime, serverTime);
// let productID = playerData.productID;
// let playerOrders: UserOrderModelType[] = await UserOrderModel.findPlayerOrder(productID, roleId, activityId, 1);
// let buyTime = moment(new Date()).startOf('d').toDate()
// let endTime = null;
// if (playerOrders.length > 0) {
// buyTime = playerOrders[0].createdAt;//购买时候的日期
// endTime = moment(buyTime).add(7, 'd').endOf('d').toDate()
// }
let playerRecord: ActivityDailyRMBGiftsModelType = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex);
let unReceiveRecord: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findBuyRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex);
let playerRecords: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.findBuyRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex);
playerData.setPlayerRecords(playerRecord, unReceiveRecord.length);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
@@ -80,7 +69,8 @@ export async function makeDailyRMBGiftsReward(roleId: string, roleName: string,
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包
let playerRecord: ActivityDailyRMBGiftsModelType = await ActivityDailyRMBGiftsModel.findRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex);
if (playerRecord && playerRecord.records && playerRecord.records.length > 0) {//今天已经购买过其他奖励
playerData.setPlayerRecords(playerRecord?[playerRecord]: []);
if (playerData.shouldbuyNextDay()) {//今天已经购买过其他奖励
playerData.todayIndex ++;
}