训练场宝箱展示bug

shared/pubUtils/gmData/gmDataUtil.ts

@@ -8,19 +8,37 @@ export async function init() {
 
 export function getGmMails(updatedMailAt: number, serverId: number) {
     let list = [];
+    let nowTime = nowSeconds();
     let serverIds = [serverId, ALL_SERVER];
     for (let serverId of serverIds) {
-        if (!gmData.mails.get(serverId)) 
+        let gmServerData = gmData.mails.get(serverId);
+        if (!gmServerData) 
             continue;
-        gmData.mails.get(serverId).map(({updatedAt, sendTime, endTime, id, sendRoles, goods, content, gmMailType})=>{
-            if (updatedAt >= updatedMailAt || sendTime > updatedMailAt || endTime < nowSeconds() )
-                list.push({updatedAt, sendTime, endTime, id, sendRoles, goods, content, gmMailType});
+            gmServerData.forEach((gmMail)=>{
+            if (gmMail.updatedAt >= updatedMailAt || gmMail.sendTime > updatedMailAt || gmMail.endTime > nowTime )
+                list.push(gmMail);
         });
     }
     return list;
 }
 
-export function getGmMailById(id: string, serverId: number) {
+export function getUseGmMails(serverId: number) {
+    let list = new Map<string, GMMail>();
+    let serverIds = [serverId, ALL_SERVER];
+    let nowTime = nowSeconds();
+    for (let serverId of serverIds) {
+        let gmServerData = gmData.mails.get(serverId);
+        if (!gmServerData) 
+            continue;
+        gmServerData.forEach((gmMail)=>{
+            if (gmMail.endTime > nowTime)
+                list.set(gmMail.id, gmMail);
+        });
+    }
+    return list;
+}
+
+export function getGmMailById(id: string, serverId: number, nowTime: number) {
     let gmMail;
     if (!!gmData.mails.get(serverId)) {
         gmMail = gmData.mails.get(serverId).get(id);
@@ -30,9 +48,24 @@ export function getGmMailById(id: string, serverId: number) {
             gmMail = gmData.mails.get(ALL_SERVER).get(id);
         }
     }
+    if (!gmMail || gmMail.endTime < nowTime)
+        return null;
     return gmMail;
 }
 
 export function setGmMails(mails: GMMail[]) {
     setMails(mails, gmData.mails);
+}
+
+
+export function getGmUseMails(serverId: number) {
+    let list = new Map<number, any>();
+    if (!!gmData.mails.get(serverId)) {
+        list =  gmData.mails.get(serverId);
+    }
+    let serverMail = gmData.mails.get(ALL_SERVER);
+    if (!!serverMail) {
+        list = Object.assign(list, serverMail);
+    }
+    return list;
 }

shared/pubUtils/gmData/gmMail.ts

@@ -34,12 +34,14 @@ export async function mailInit() {
     let gmMail = new Map<number, any>();
     let mails = await GMMailModel.getMails();
     mails.map((o:any)=>{
-        o.id = o._id; 
+        let id:string = JSON.stringify(o._id); 
+        o.id = id;
         o.updatedAt = Math.floor(o.updatedAt.getTime()/1000);
         let mail = gmMail.get(o.serverId);
         if (!mail)
             mail = new Map<string, GMMail>();
-        mail.set(o._id, _.pick(o, Object.keys(GMMailKeys)));
+        o.sendName = o.sendName||'系统';
+        mail.set(o.id, _.pick(o, Object.keys(GMMailKeys)));
         gmMail.set(o.serverId, mail);
     });
     return gmMail;
@@ -48,12 +50,14 @@ export async function mailInit() {
 
 export function setMails(mails:GMMail[], gmMail) {
     mails.map((o:any)=>{
-        o.id = o._id; 
+        let id:string = JSON.stringify(o._id); 
+        o.id = id;
         o.updatedAt = Math.floor(o.updatedAt.getTime()/1000);
+        o.sendName = o.sendName||'系统';
         let mail = gmMail.get(o.serverId);
         if (!mail)
             mail = new Map<string, GMMail>();
-        mail.set(o._id, _.pick(o, Object.keys(GMMailKeys)));
+        mail.set(o.id, _.pick(o, Object.keys(GMMailKeys)));
         gmMail.set(o.serverId, mail);
     });
 }

shared/pubUtils/interface.ts

@@ -110,7 +110,6 @@ export interface pushMail {
 
 export interface mailData {
     id: string;
-    mailId: string;
     goods: RewardInter[];
     sendTime: number;
     endTime: number;