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
game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts
+24 -29
View File
@@ -6,6 +6,7 @@ import { RewardParam } from '../../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts';
import moment = require('moment');
import { DailyRMBGiftsItem } from '../../../domain/activityField/dailyRMBGiftsField';
export default function (app: Application) {
new HandlerService(app, {});
@@ -49,11 +50,11 @@ export class DailyRMBGiftsHandler {
const sid = session.get('sid');
const roleName = session.get('roleName');
let playerData = await getPlayerDailyRMBGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
if (id > 0) {//领取单个--免费奖励
let items: DailyRMBGiftsItem[] = [];
if(id > 0) {
let item = playerData.findItem(id);
if (!item) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
@@ -64,37 +65,31 @@ export class DailyRMBGiftsHandler {
if (!playerData.isBuy && item.price > 0) {
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.DAILY_RMB_GIFT)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex, [item.id]);
item.isReceive = true;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, id },
items: [item]
}));
} else {//一键领取全天的奖励
items.push(item);
} else {
if (!playerData.isBuy) {
return resResult(STATUS.ACTIVITY_UNOPENED);
}
let items = playerData.unReceiveItem();
if (items.length == 0) {
return resResult(STATUS.ACTIVITY_REWARDED);
}
let rewardArray = [];
let ids = []
for (let item of items) {
ids.push(item.id)
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
rewardArray = rewardArray.concat(rewardParamArr);
item.isReceive = true;
}
let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.DAILY_RMB_GIFT)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex, ids);
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId },
items: items
}));
items.push(...playerData.unReceiveItem());
}
if (items.length == 0) {
return resResult(STATUS.ACTIVITY_REWARDED);
}
let rewardArray: RewardParam[] = [];
let ids: number[] = []
for (let item of items) {
ids.push(item.id);
rewardArray.push(...stringToRewardParam(item.reward));
}
let resultItems = playerData.receiveItems(ids);
let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.DAILY_RMB_GIFT)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), playerData.todayIndex, ids);
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, unReceiveCount: playerData.unReceiveCount, buttonStatus: playerData.buttonStatus },
items: resultItems
}));
}
}
game-server/app/services/activity/dailyRMBGiftsService.ts
+4 -14
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 ++;
}