邮件一键领取bug
This commit is contained in:
@@ -86,9 +86,9 @@ export default class GroupMail extends BaseModel {
|
||||
return ids;
|
||||
}
|
||||
|
||||
public static async updateMailStatus(ids: string[], status: number, roleId: string) {
|
||||
const result = await GroupMailModel.update({_id: {$in: ids}, 'sendRoles.roleId': roleId, sendTime:{$lte: nowSeconds()}}, { $set:{ 'sendRoles.$.status': status } });
|
||||
return result;
|
||||
public static async updateMailStatus(ids: any[], status: number, roleId: string) {
|
||||
const count = await GroupMailModel.update({_id: {$in: ids}, 'sendRoles.roleId': roleId, sendTime:{$lte: nowSeconds()}}, { $set:{ 'sendRoles.$.status': status } });
|
||||
return count;
|
||||
}
|
||||
|
||||
public static async delMail(_id: string, roleId: string, lean = true) {
|
||||
|
||||
+3
-2
@@ -81,8 +81,9 @@ export default class Mail extends BaseModel {
|
||||
return ids;
|
||||
}
|
||||
|
||||
public static async updateMailStatus(ids: string[], status: number) {
|
||||
await MailModel.update({ _id: { $in: ids } }, { $set: { status } });
|
||||
public static async updateMailStatus(ids: any[], status: number) {
|
||||
let count = await MailModel.update({ _id: { $in: ids } }, { $set: { status } });
|
||||
return count;
|
||||
}
|
||||
|
||||
public static async delMail(_id: string, lean = true) {
|
||||
|
||||
@@ -34,8 +34,7 @@ export async function mailInit() {
|
||||
let gmMail = new Map<number, any>();
|
||||
let mails = await GMMailModel.getMails();
|
||||
mails.map((o:any)=>{
|
||||
let id:string = JSON.stringify(o._id);
|
||||
o.id = id;
|
||||
o.id = o._id.toString();
|
||||
o.updatedAt = Math.floor(o.updatedAt.getTime()/1000);
|
||||
let mail = gmMail.get(o.serverId);
|
||||
if (!mail)
|
||||
@@ -50,8 +49,7 @@ export async function mailInit() {
|
||||
|
||||
export function setMails(mails:GMMail[], gmMail) {
|
||||
mails.map((o:any)=>{
|
||||
let id:string = JSON.stringify(o._id);
|
||||
o.id = id;
|
||||
o.id = o._id.toString();
|
||||
o.updatedAt = Math.floor(o.updatedAt.getTime()/1000);
|
||||
o.sendName = o.sendName||'系统';
|
||||
let mail = gmMail.get(o.serverId);
|
||||
|
||||
Reference in New Issue
Block a user