From e434f2a6214f7a53f771f9728a191a926201b716 Mon Sep 17 00:00:00 2001
From: mamengke01 <794347210@qq.com>
Date: Wed, 13 Jan 2021 16:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E9=82=AE=E4=BB=B6=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/connector/remote/connectorRemote.ts  |  2 +-
 shared/db/Mail.ts                                | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/game-server/app/servers/connector/remote/connectorRemote.ts b/game-server/app/servers/connector/remote/connectorRemote.ts
index 06b196622..d6e23f67c 100644
--- a/game-server/app/servers/connector/remote/connectorRemote.ts
+++ b/game-server/app/servers/connector/remote/connectorRemote.ts
@@ -32,7 +32,7 @@ export class ConnectorRemote {
         let sid = pinus.app.getServerId();
         if (!!sid) {
             let uids = [{uid, sid}];
-            this.channelService.pushMessageByUids(route, data, uids);
+            this.channelService.pushMessageByUids(route, resResult(STATUS.SUCCESS, {mails:data}), uids);
         }
     }
 }
diff --git a/shared/db/Mail.ts b/shared/db/Mail.ts
index 541adc0fd..a99172ff1 100644
--- a/shared/db/Mail.ts
+++ b/shared/db/Mail.ts
@@ -1,8 +1,10 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
-import { RewardInter } from '../pubUtils/interface';
 import { nowSeconds } from '../pubUtils/timeUtil';
-
+class RewardInter {
+    id: number;
+    count: number;
+}
 @index({ roleId: 1 })
 
 export default class Mail extends BaseModel {
@@ -12,9 +14,9 @@ export default class Mail extends BaseModel {
     @prop({ required: true })
     mailId: number;
 
-    @prop({ required: true })
-    goods: Array<RewardInter>;
-
+    @prop({ required: true, type:RewardInter, default: [], _id: false})
+    goods: RewardInter[];
+    
     @prop({ required: true, default: nowSeconds() })
     sendTime: number; 
 
@@ -28,8 +30,8 @@ export default class Mail extends BaseModel {
     public static async addMail(params:{roleId: string, goods: Array<RewardInter>, sendName: string, mailId: number, sendTime?: number}) {
         const doc = new MailModel();
         const mail = Object.assign(doc.toJSON(), params);
-        const mailInfo: MailType = await MailModel.create(mail);
-        return mailInfo;
+        await MailModel.create(mail);
+        return mail;
     }
 }