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

邮件一键领取bug

Browse Source
This commit is contained in:
mamengke01
2021-02-22 15:39:00 +08:00
parent 0f7b528d67
commit 60b2e6351f
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/gm/remote/gmRemote.ts
+7 -5
View File
@@ -9,6 +9,8 @@ import { findWhere } from 'underscore';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { GroupMailType } from '../../../db/GroupMail';
import { MailType } from '../../../db/Mail';
import { mongoose } from '@typegoose/typegoose';
const { ObjectId } = mongoose.Types;
export default function (app: Application) {
return new GMRemote(app);
}
@@ -150,22 +152,22 @@ export class GMRemote {
let nowTime = nowSeconds();
let mailGoods = [];
let mails = [];
let mailIds: string[] = [];
let groupMailIds: string[] = [];
let mailIds = [];
let groupMailIds = [];
groupMailRewards.map(({_id, goods, mailId, mailTemType})=>{
if (mailTemType == MAIL_TEM_TYPE.GMTYPE) {
let gmMail = getGmMailById(mailId, serverId, nowTime);
if (!gmMail || !gmMail.goods.length|| gmMail.endTime < nowSeconds()) {
return;
}
mailGoods.push(...gmMail.goods);
mailGoods.push(...goods);
} else {
if (goods.length)
return;
mailGoods.push(...goods);
}
mails.push({id: _id, status: MAIL_STATUS.RECEIVED, mailType: MAIL_TYPE.GROUPMAIL});
groupMailIds.push(_id);
groupMailIds.push(ObjectId(_id));
});
mailRewards.map(({_id, goods, mailId, mailTemType})=>{
if (mailTemType == MAIL_TEM_TYPE.GMTYPE) {
@@ -180,7 +182,7 @@ export class GMRemote {
mailGoods.push(...goods);
}
mails.push({id: _id, status: MAIL_STATUS.RECEIVED, mailType: MAIL_TYPE.SINGLEMAIL});
mailIds.push(_id);
mailIds.push(ObjectId(_id));
});
return {mailIds, groupMailIds, mails, mailGoods};
}
game-server/app/servers/role/handler/mailHandler.ts
+6 -5
View File
@@ -6,7 +6,8 @@ import { STATUS } from '../../../consts/statusCode';
import { findWhere } from 'underscore';
import { MAIL_STATUS, MAIL_TEM_TYPE, MAIL_TYPE } from '../../../consts/constModules/mailConst';
import { handleCost, addItems } from '../../../services/rewardService';
import { getGmMailById } from '../../../pubUtils/gmData/gmDataUtil';
import { mongoose } from '@typegoose/typegoose';
const { ObjectId } = mongoose.Types;
import { nowSeconds } from '../../../pubUtils/timeUtil';
export default function(app: Application) {
return new RoleHandler(app);
@@ -55,15 +56,15 @@ export class RoleHandler {
} else {//一键删除
let mails = [];
let resGroupMailIds = await GroupMailModel.findReadAndRewardsMails(roleId);
let groupMailIds: string[] = resGroupMailIds.map(({_id})=>{
let groupMailIds = resGroupMailIds.map(({_id})=>{
mails.push({id:_id, status: MAIL_STATUS.DELETE, mailType: MAIL_TYPE.GROUPMAIL});
return _id;
return ObjectId(_id);
});
await GroupMailModel.updateMailStatus(groupMailIds, MAIL_STATUS.DELETE, roleId);
let resMailIds = await MailModel.findReadAndRewardsMails(roleId);
let mailIds: string[] = resMailIds.map(({_id})=>{
let mailIds = resMailIds.map(({_id})=>{
mails.push({id: _id, status: MAIL_STATUS.DELETE, mailType: MAIL_TYPE.SINGLEMAIL});
return _id;
return ObjectId(_id);
});
await MailModel.updateMailStatus(mailIds, MAIL_STATUS.DELETE);