邮件活跃度下发

2021-02-05 11:45:07 +08:00
parent 871e71ab54
commit 286eb231a6
36 changed files with 1183 additions and 439 deletions
--- a/shared/db/GMMail.ts
+++ b/shared/db/GMMail.ts
@@ -0,0 +1,68 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { nowSeconds } from '../pubUtils/timeUtil';
+import { now } from 'moment';
+class RewardInter {
+    id: number;
+    count: number;
+}
+class SendRole {
+    @prop({ required: true })
+    roleId: string;
+    @prop({ required: true })
+    status: number;
+}
+
+export default class GMMail extends BaseModel {
+
+    @prop({ required: true })
+    serverId: number;
+
+    @prop({ required: true })
+    sendRoles: SendRole[];
+
+    @prop({ required: true, type: RewardInter, default: [], _id: false })
+    goods: RewardInter[];
+
+    @prop({ required: true, default: nowSeconds() })
+    sendTime: number;
+
+    @prop({ required: true })
+    endTime: number;
+
+    @prop({ required: true })
+    content: string;
+    
+    @prop({ required: true })
+    sendName: string;
+
+    @prop({ required: true })
+    gmMailType: number; //1:群体邮件，2：分服务器邮件
+
+    public static async addMail(params: {serverId: number, sendRoles: SendRole[], sendName: string, endTime: number, content: string, gmMailType: number, sendTime?: number, goods?: RewardInter[] }) {
+        const doc = new GMMailModel();
+        const mail = Object.assign(doc.toJSON(), params);
+        await GMMailModel.create(mail);
+        return mail;
+    }
+
+    public static async getGmMailById(_id: string, lean = true) {
+        const result: GMMailType = await GMMailModel.findOne({ _id }).lean(lean);
+        return result;
+    }
+
+    public static async getMail(updatedMailAt: number, lean = true) {
+        const result: GMMailType[] = await GMMailModel.find({ $or: [{updatedAt: { $gte: new Date(updatedMailAt) }}, {sendTime: { $lte: nowSeconds() }}], endTime: { $gte: nowSeconds()} }).lean(lean);
+        return result;   
+    }
+    
+    public static async getMails( lean = true) {
+        const result: GMMailType[] = await GMMailModel.find({ endTime: { $gte: nowSeconds() }}).lean(lean);
+        return result;
+    }
+
+}
+
+export const GMMailModel = getModelForClass(GMMail);
+
+export interface GMMailType extends Pick<DocumentType<GMMail>, keyof GMMail> { };
--- a/shared/db/GroupMail.ts
+++ b/shared/db/GroupMail.ts
@@ -0,0 +1,109 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { nowSeconds } from '../pubUtils/timeUtil';
+import { SrvRecord } from 'dns';
+import { MAIL_STATUS } from '../consts/constModules/mailConst';
+import { select } from 'underscore';
+class RewardInter {
+    id: number;
+    count: number;
+}
+class SendRole {
+    @prop({ required: true })
+    roleId: string;
+    @prop({ required: true })
+    status: number;
+}
+
+@index({ sendRoles: 1 })
+@index({ mailId: 1, type: 1 })
+export default class GroupMail extends BaseModel {
+    @prop({ required: true })
+    sendRoles: SendRole[];					
+
+    @prop({ required: true })
+    mailId: string;
+
+    @prop({ required: true, type:RewardInter, default: [], _id: false})
+    goods: RewardInter[];
+    
+    @prop({ required: true, default: nowSeconds() })
+    sendTime: number; 
+
+    @prop({ required: true, default: nowSeconds() })
+    endTime: number; 
+
+    @prop({ required: true })
+    params: string[]; 
+
+    @prop({ required: true })
+    mailTemType: number; //1:表示模板邮件，2：表示系统邮件
+    
+    @prop({ required: true })
+    sendName: string;
+    public static async addGroupMails(mails: Array<GroupMailType>) {
+        await GroupMailModel.insertMany(mails);
+    }
+
+    public static async addGroupMail(params:{ sendRoles: SendRole[],mailId: string, mailTemType:number,  goods?: Array<RewardInter>, sendName?: string,  endTime?:number, sendTime?: number, params?:string[] }) {
+        const doc = new GroupMailModel();
+        const mail = Object.assign(doc.toJSON(), params);
+        await GroupMailModel.create(mail);
+        return mail;
+    }
+
+    public static async getGroupMailsByRoleId(roleId: string, lean = true) {
+        const result: GroupMailType[] = await GroupMailModel.findOne({ 'sendRoles.roleId': roleId, 'sendRoles.status': { $ne: -1}, endTime: { $gte: nowSeconds() }}).lean(lean);
+        return result;
+    }
+
+    public static async getMail( mailId: string, mailTemType: number, lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOne({ mailId, mailTemType }).lean(lean);
+        return result;
+    }
+
+    public static async pushRoleMail( roleId: string, mailId: string, mailTemType: number, lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ mailId, mailTemType }, {$push: {sendRoles: {roleId, status: 0}}}).lean(lean);
+        return result;
+    }
+
+    public static async getMailById(_id: string, lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOne({ _id }).lean(lean);
+        return result;
+    }
+
+    public static async updateMailByStatus(_id: string, roleId: string, status: number, conditions: number[], lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ _id, 'sendRoles.roleId': roleId, 'sendRoles.status': {$in: conditions} }, {$set:{ 'sendRoles.$.status': status }}, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async deleteMail(_id: string, roleId: string, status: number, lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ _id, 'sendRoles.roleId': roleId, }, {$set:{ 'sendRoles.$.status': status }}, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async findReadAndRewardsMails(roleId: string, lean = true) {
+        const ids: string[] = await GroupMailModel.find({ 'sendRoles.roleId': roleId, $or:[ {$and: [{'sendRoles.status': MAIL_STATUS.READ, goods: []}]}, {'sendRoles.status': MAIL_STATUS.RECEIVED}] }).select('_id').lean(lean);
+        return ids;
+    }
+
+    public static async updateMailStatus(ids: string[], status: number, roleId: string) {
+        const result: GroupMailType[] = await GroupMailModel.update({_id: {$in: ids}, 'sendRoles.roleId': roleId}, { $set:{ 'sendRoles.$.status': status } });
+        return result;
+    }
+
+    public static async delMail(_id: string, roleId: string,  lean = true) {
+        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ _id, 'sendRoles.roleId': roleId,  $or:[ {$and: [{'sendRoles.status': MAIL_STATUS.READ, goods: []}]}, {'sendRoles.status': MAIL_STATUS.RECEIVED}] }, { $set:{ 'sendRoles.$.status': MAIL_STATUS.DELETE } }, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async findRewardsMails(roleId: string, lean = true) {
+        const result: GroupMailType[] = await GroupMailModel.find({ 'sendRoles.roleId': roleId, $and: [{'sendRoles.status': MAIL_STATUS.READ, goods: {$ne: []}}] }).select('_id goods').lean(lean);
+        return result;
+    }
+}
+
+export const GroupMailModel = getModelForClass(GroupMail);
+
+export interface GroupMailType extends Pick<DocumentType<GroupMail>, keyof GroupMail>{}
+export type GroupMailTypeParam = Partial<GroupMailType>; // 将所有字段变成可选项
--- a/shared/db/Mail.ts
+++ b/shared/db/Mail.ts
@@ -1,46 +1,98 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
+import { MAIL_STATUS } from '../consts/constModules/mailConst';
 class RewardInter {
    id: number;
    count: number;
 }
@index({ roleId: 1 })
+@index({ roleId: 1, mailId: 1, type: 1 })

 export default class Mail extends BaseModel {
    @prop({ required: true })
    roleId: string;

    @prop({ required: true })
-    mailId: number;
+    mailId: string;

-    @prop({ required: true, type:RewardInter, default: [], _id: false})
+    @prop({ required: true, type: RewardInter, default: [], _id: false })
    goods: RewardInter[];
-    
-    @prop({ required: true, default: nowSeconds() })
-    sendTime: number; 

-    @prop({ required: true, default: "" })
-    sendName: string; 
+    @prop({ required: true, default: nowSeconds() })
+    sendTime: number;

    @prop({ required: true })
-    content: string; 
+    params: string[];

-    @prop({ required: true, default: 0 })
-    status: number; 
+    @prop({ required: true, default: MAIL_STATUS.CREATE })
+    status: number;

+    @prop({ required: true })
+    mailTemType: number; //1:表示模板邮件，2：表示系统邮件    
+
+    @prop({ required: true })
+    sendName: string;
+
+    @prop({ required: true })
+    endTime: number;
    public static async addMails(mails: Array<MailType>) {
        await MailModel.insertMany(mails);
    }

-    public static async addMail(params:{ roleId: string, goods: Array<RewardInter>, sendName: string, mailId: number, sendTime?: number, content?:string }) {
+    public static async addMail(params: { roleId: string, goods: Array<RewardInter>, sendName: string, mailId: string, endTime: number, mailTemType: number, params?: string[], sendTime?: number }) {
        const doc = new MailModel();
        const mail = Object.assign(doc.toJSON(), params);
        await MailModel.create(mail);
        return mail;
    }
+
+    public static async getMailsByRoleId(roleId: string, lean = true) {
+        const result: MailType[] = await MailModel.find({ roleId, status: { $ne: -1 } }).lean(lean);
+        return result;
+    }
+
+    public static async getMail(roleId: string, mailId: string, mailTemType: number, lean = true) {
+        const result: MailType = await MailModel.findOne({ roleId, mailId, mailTemType }).lean(lean);
+        return result;
+    }
+
+    public static async getMailById(_id: string, lean = true) {
+        const result: MailType = await MailModel.findOne({ _id }).lean(lean);
+        return result;
+    }
+
+    public static async updateMailByStatus(_id: string, conditions: number[], update: MailTypeParam, lean = true) {
+        const result: MailType = await MailModel.findOneAndUpdate({ _id, status: { $in: conditions } }, { $set: update }, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async updateMail(_id: string, update: MailTypeParam, lean = true) {
+        const result: MailType = await MailModel.findOneAndUpdate({ _id }, { $set: update }, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async findReadAndRewardsMails(roleId: string, lean = true) {
+        const ids: string[] = await MailModel.find({ roleId, $or: [{ $and: [{ status: MAIL_STATUS.READ, goods: [] }] }, { status: MAIL_STATUS.RECEIVED }] }).select('_id').lean(lean);
+        return ids;
+    }
+
+    public static async updateMailStatus(ids: string[], status: number) {
+        await MailModel.update({ _id: { $in: ids } }, { $set: { status } });
+    }
+
+    public static async delMail(_id: string, lean = true) {
+        const result: MailType = await MailModel.findOneAndUpdate({ _id, $or: [{ $and: [{ status: MAIL_STATUS.READ, goods: [] }] }, { status: MAIL_STATUS.RECEIVED }] }, { $set: { status: MAIL_STATUS.DELETE } }, { new: true }).lean(lean);
+        return result;
+    }
+
+    public static async findRewardsMails(roleId: string, lean = true) {
+        const result: MailType[] = await MailModel.find({ roleId, $and: [{ status: MAIL_STATUS.READ, goods: { $ne: [] } }] }).select('_id goods').lean(lean);
+        return result;
+    }
 }

 export const MailModel = getModelForClass(Mail);

-export interface MailType extends Pick<DocumentType<Mail>, keyof Mail> { };
+export interface MailType extends Pick<DocumentType<Mail>, keyof Mail> { };
+export type MailTypeParam = Partial<MailType>; // 将所有字段变成可选项
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -224,7 +224,8 @@ export default class Role extends BaseModel {
    blockCnt: number;              // 黑名单人数
    @prop({ required: true, default: 0 })
    recFrdApplyCnt: number;        // 玩家收取好友申请数量
-
+    @prop({ required: true, default: 0 })
+    updatedMailAt: number;
    public static async findAllByUid(uid: number, lean = true) {
        const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId').lean(lean);
        return role;