邮件:GM后台发送邮件逻辑修改
This commit is contained in:
@@ -7,7 +7,7 @@ import { pinus } from "pinus";
|
||||
import { getWorldChannelSid } from "./chatChannelService";
|
||||
import { ServerlistModel, ServerlistType } from "../db/Serverlist";
|
||||
import { NoticeModel, NoticeType } from "../db/Notice";
|
||||
import { SendMailFun } from "./mailService";
|
||||
import { SendMailFun, sendMailsByGmMail } from "./mailService";
|
||||
import GMMail, { GMMailModel, GMMailType } from '../db/GMMail';
|
||||
import moment = require("moment");
|
||||
import { getSeconds, nowSeconds } from "../pubUtils/timeUtil";
|
||||
@@ -153,27 +153,8 @@ export async function sendOpenServerMail(type: 'openMail'|'circleMail', mail: St
|
||||
let addParam = new GMMail();
|
||||
addParam.setByRegionStategy(type, mail, newServer, uid);
|
||||
let gmmail = await GMMailModel.addMail(addParam, uid);
|
||||
let needSend = false;
|
||||
if(mail.timeType == MAIL_TIME_TYPE.CIRCLE) {
|
||||
let refTimeStr = REF_CIRCLE_MAIL_TIME >= 10? `${REF_CIRCLE_MAIL_TIME}`: `0${REF_CIRCLE_MAIL_TIME}`;
|
||||
let refTime = moment(moment().format(`YYYY-MM-DD ${refTimeStr}:00:00`)).unix();
|
||||
let sendTime = moment(moment().format('YYYY-MM-DD '+ mail.circleHour)).unix();
|
||||
if(sendTime < refTime) sendTime += 86400;
|
||||
let now = nowSeconds();
|
||||
if(refTime < now && sendTime > now) {
|
||||
needSend = true;
|
||||
}
|
||||
} else {
|
||||
needSend = true;
|
||||
}
|
||||
if(needSend) {
|
||||
let f = new SendMailFun();
|
||||
let code = await f.setWithGmMail(gmmail);
|
||||
if(code) {
|
||||
await f.createServerMails(code, [newServer.id]);
|
||||
await f.pushToUsers();
|
||||
}
|
||||
}
|
||||
|
||||
await sendMailsByGmMail([gmmail]);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user