邮件一键领取bug

game-server/app/servers/gm/remote/gmRemote.ts

@@ -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};
     }