diff --git a/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts b/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts index dc8b444d5..13c63cd03 100644 --- a/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts +++ b/game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts @@ -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 = 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 = 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 + })); } } diff --git a/game-server/app/services/activity/dailyRMBGiftsService.ts b/game-server/app/services/activity/dailyRMBGiftsService.ts index a5279a512..311540140 100644 --- a/game-server/app/services/activity/dailyRMBGiftsService.ts +++ b/game-server/app/services/activity/dailyRMBGiftsService.ts @@ -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 ++; } diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index 8b1c5444c..b4f1696bc 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -166,6 +166,14 @@ export const SIGNIN_VIP_OPEN_LIMIT = 15; //每日特惠礼包RMB购买4挡,一次性支付购买7天,每天只能领取当天的礼包奖励 export const DAILYRMBGIFTS_DAYS = 7;//一次性购买*天 +export enum DAILY_RMB_GIFT_STATUS { + CAN_BUY = 0, // 可以购买 + CAN_NOT_BUY = 1, // 不可购买 + CAN_RECEIVE = 2, // 可以一键领取 + HAS_RECEIVED = 3, // 已一键领取 + +} + //签到活动开启时间 export const SIGNIN_OPEN = 1;//*号0点开启 export const SIGNIN_CLOSE = 31;//*号晚上24点结束 diff --git a/shared/db/ActivityDailyRMBGifts.ts b/shared/db/ActivityDailyRMBGifts.ts index b2c06cbdb..f6a7e90b2 100644 --- a/shared/db/ActivityDailyRMBGifts.ts +++ b/shared/db/ActivityDailyRMBGifts.ts @@ -69,7 +69,7 @@ export default class Activity_Daily_RMB_Gifts extends BaseModel { //获取已经购买还没有领取的数据 public static async findBuyRecord(serverId: number, activityId: number, roleId: string, beginTime: Date, todayIndex: number) { let result: ActivityDailyRMBGiftsModelType[] = await ActivityDailyRMBGiftsModel.find( - { serverId, roleId, activityId, beginTime, todayIndex: { $gt: todayIndex } }).lean(true); + { serverId, roleId, activityId, beginTime, todayIndex: { $gte: todayIndex } }).lean(true); return result; } diff --git a/shared/domain/activityField/dailyRMBGiftsField.ts b/shared/domain/activityField/dailyRMBGiftsField.ts index 5cac80a89..dce374d83 100644 --- a/shared/domain/activityField/dailyRMBGiftsField.ts +++ b/shared/domain/activityField/dailyRMBGiftsField.ts @@ -1,4 +1,4 @@ -import { DAILYRMBGIFTS_DAYS } from '../../consts'; +import { DAILYRMBGIFTS_DAYS, DAILY_RMB_GIFT_STATUS } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyRMBGiftsModelType } from '../../db/ActivityDailyRMBGifts'; import { ActivityBase } from './activityField'; @@ -32,13 +32,14 @@ export class DailyRMBGiftsData extends ActivityBase { list: Array = [];//每件商品信息 isBuy: boolean = false;//是否一次性购买过 + unReceived: number[] = []; unReceiveCount: number = 0;//剩余领取次数（一次性购买） + buttonStatus: number = DAILY_RMB_GIFT_STATUS.CAN_BUY; public unReceiveItem() { return this.list.filter(obj => { return !obj.isReceive }); } - public findItem(id: number) { let index = this.list.findIndex(obj => { return obj.id == id }); return (index != -1) ? this.list[index] : null @@ -50,29 +51,61 @@ export class DailyRMBGiftsData extends ActivityBase { } //解析玩家领取记录 - public setPlayerRecords(data: ActivityDailyRMBGiftsModelType, unReceiveCount: number) { - this.isBuy = false; - this.unReceiveCount = 0; - if (!data) { - return; - } - let records = data.records ? data.records : []; - let isOver = true; - for (let item of this.list) { - let index = records.findIndex(obj => { return obj.id === item.id }) - if (index != -1) { - item.isReceive = true; - } - if (!item.isReceive) { - isOver = false; + public setPlayerRecords(playerRecords: ActivityDailyRMBGiftsModelType[]) { + for(let playerRecord of playerRecords) { + if(playerRecord.todayIndex == this.todayIndex) { + this.isBuy = !!playerRecord.isBuy; + let records = playerRecord.records ? playerRecord.records : []; + for(let {id} of records) { + let item = this.findItem(id); + if(item) item.isReceive = true; + } + } else { + this.unReceived.push(playerRecord.todayIndex); } } - this.isBuy = data.isBuy ? data.isBuy : false; - this.unReceiveCount = unReceiveCount; - if (this.isBuy && !isOver) { - this.unReceiveCount += 1; + this.calTodayReceiveStatus(); + this.calButtonStatus(); + } + + public calTodayReceiveStatus() { + if(this.isBuy) { + let hasAllReceived = !this.list.find(item => !item.isReceive); + console.log('##### calTodayReceiveStatus', this.unReceived, this.todayIndex, hasAllReceived) + if(!hasAllReceived && this.unReceived.indexOf(this.todayIndex) == -1) { + this.unReceived.push(this.todayIndex); + } } + this.unReceiveCount = this.unReceived.length; + } + + public calButtonStatus() { + if(this.isBuy) { // 已购买 + let hasAllReceived = !this.list.find(item => !item.isReceive); + if(hasAllReceived) { // 买了且全都领完 + this.buttonStatus = DAILY_RMB_GIFT_STATUS.HAS_RECEIVED; + } else { + this.buttonStatus = DAILY_RMB_GIFT_STATUS.CAN_RECEIVE; + } + } + } + + public shouldbuyNextDay() { + return this.list.filter(item => item.isReceive && item.price != 0).length != 0; + } + + public receiveItems(ids: number[]) { + let items: DailyRMBGiftsItem[] = []; + for(let item of this.list) { + if(ids.indexOf(item.id) != -1) { + item.isReceive = true; + items.push(item); + } + } + this.calButtonStatus(); + this.calTodayReceiveStatus(); + return items; } public initData(data: string) { diff --git a/shared/resource/jsons/dic_pvp_boxReward.json b/shared/resource/jsons/dic_pvp_boxReward.json index 4f16b8256..d170dbcc0 100644 --- a/shared/resource/jsons/dic_pvp_boxReward.json +++ b/shared/resource/jsons/dic_pvp_boxReward.json @@ -22,7 +22,7 @@ { "id": 5, "score": 2500, - "reward": "40005&500" + "reward": "60004&1" }, { "id": 6,