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-12-01 14:44:24 +08:00
parent 9ef5c7d36a
commit f92972408e
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/dailyMealHandler.ts
+1 -1
View File
@@ -77,7 +77,7 @@ export class DailyMealHandler {
//免费期间 //免费期间
let rewardParamArr: Array<RewardParam> = stringToRewardParam(itemData.reward); let rewardParamArr: Array<RewardParam> = stringToRewardParam(itemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr) let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
await ActivityDailyMealModel.addReceiveRecord(serverId, activityId, roleId, type, curDate); await ActivityDailyMealModel.addReceiveRecord(serverId, activityId, roleId, type, curDate, playerData.roundIndex);
itemData.isReceive = true; itemData.isReceive = true;
return resResult(STATUS.SUCCESS, Object.assign(result, { return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, type }, param: { activityId, type },
game-server/app/services/activity/dailyMealService.ts
+4 -4
View File
@@ -25,8 +25,8 @@ export async function dailyMealActivity(serverId: number, roleId: string) {
let { createTime } = await RoleModel.findByRoleId(roleId); let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyMealData(activityData, createTime); let playerData = new DailyMealData(activityData, createTime);
let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.beginTime, playerData.endTime); let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.roundIndex);
let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.beginTime, playerData.endTime); let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.roundIndex);
playerData.setPlayerRecords(playerLunchRecords.concat(playerDinnerRecords)); playerData.setPlayerRecords(playerLunchRecords.concat(playerDinnerRecords));
return playerData; return playerData;
} }
@@ -45,8 +45,8 @@ export async function getPlayerDailyMealData(activityId: number, serverId: numbe
let { createTime } = await RoleModel.findByRoleId(roleId); let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyMealData(activityData, createTime); let playerData = new DailyMealData(activityData, createTime);
let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.beginTime, playerData.endTime); let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.roundIndex);
let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.beginTime, playerData.endTime); let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.roundIndex);
playerData.setPlayerRecords(playerLunchRecords.concat(playerDinnerRecords)); playerData.setPlayerRecords(playerLunchRecords.concat(playerDinnerRecords));
return playerData; return playerData;
} }
shared/db/ActivityDailyMeal.ts
+9 -4
View File
@@ -17,26 +17,31 @@ export default class Activity_Daily_Meal extends BaseModel {
receiveTime: number; // 领取时间 receiveTime: number; // 领取时间
@prop({ required: true }) @prop({ required: true })
type: number; // 1午餐、2晚餐类型 type: number; // 1午餐、2晚餐类型
@prop({ required: true })
roundIndex: number; // 周期数
//领取记录 //领取记录
public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, type: number, receiveTime: number) { public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, type: number, receiveTime: number, roundIndex: number) {
await ActivityDailyMealModel.insertMany([ await ActivityDailyMealModel.insertMany([
{ {
serverId, serverId,
activityId, activityId,
roleId, roleId,
receiveTime, receiveTime,
type type,
roundIndex,
} }
]) ])
} }
//根据活动时间查询活动数据 //根据活动时间查询活动数据
public static async findData(serverId: number, activityId: number, roleId: string, type: number, beginTime: number, endTime: number) { public static async findData(serverId: number, activityId: number, roleId: string, type: number, roundIndex: number) {
let result: ActivityDailyMealModelType[] = await ActivityDailyMealModel.find({ let result: ActivityDailyMealModelType[] = await ActivityDailyMealModel.find({
serverId, roleId, activityId, type, serverId, roleId, activityId, type,
receiveTime: { $gt: beginTime, $lt: endTime } roundIndex: roundIndex,
}).lean(true); }).lean(true);
return result; return result;
} }