后台：邮件查询

shared/db/GMMail.ts

@@ -2,8 +2,10 @@
  * 邮件的模板，在GM后台能看到的邮件列表
  */
 import BaseModel from './BaseModel';
-import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { getModelForClass, prop, DocumentType, mongoose } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
+import { GM_MAIL_STATUS, GM_MAIL_TYPE, MAIL_TIME_TYPE } from '../consts';
+import { SearchMailParam } from '@domain/backEndField/search';
 
 class Reward {
     @prop({ required: true })
@@ -12,28 +14,72 @@ class Reward {
     count: number;
 }
 
+class Receiver {
+    @prop({ required: true })
+    env: string;
+    @prop({ required: true })
+    serverId: number;
+    @prop({ required: true })
+    roleId?: string;
+    @prop({ required: true })
+    roleName?: string;
+}
+
 export default class GMMail extends BaseModel {
 
+    @prop({ required: false})
+    hasGoods: boolean;                 // 有效时间，单位小时
+
     @prop({ required: true, type: Reward, default: [], _id: false })
     goods: Reward[];
 
     @prop({ required: true, default: true })
-    useTempTime: boolean;          // 生成邮件是否按照模板时间
+    timeType: MAIL_TIME_TYPE;          // 邮件时间类型
 
     @prop({ required: false})
-    continueHour: number;           // 如果不按模板时间，sendTime为生成单独邮件的时候，endTime为sendTime+continueHour，单位小时
+    expire: number;                 // 有效时间，单位小时
 
     @prop({ required: true })
-    sendTime: number;               // 如果按照模板时间，发送时间，10位时间戳
+    startTime: number;               // 发送时间，延时邮件使用
 
     @prop({ required: true })
-    endTime: number;                // 如果按照模板时间，过期时间，10位时间戳
+    circleStart: number;               // 循环邮件开始循环时间
+
+    @prop({ required: true })
+    circleEnd: number;               // 循环邮件结束循环时间
+
+    @prop({ required: true })
+    circleDay: number;               // 循环时间，每周几，0表示每天
+
+    @prop({ required: true })
+    circleHour: number;               // 几点发送
+
+    @prop({ required: true })
+    title: string;
 
     @prop({ required: true })
     content: string;
     
     @prop({ required: true })
     sendName: string;
+    
+    @prop({ required: true })
+    mailType: GM_MAIL_TYPE;         // 收件人类型
+
+    @prop({ required: true })
+    env: string;                  // 大区环境变量
+
+    @prop({ required: true, type: Receiver, _id: false })
+    receivers: Receiver[];
+
+    @prop({ required: true })
+    reason: string;                   // 原因
+
+    @prop({ required: true })
+    isSp: boolean;                   // 特殊邮件
+
+    @prop({ required: true })
+    status: GM_MAIL_STATUS;           // 邮件状态
 
     public static async addMail(params: GMMailTypeParam, uid = 1) {
         const doc = new GMMailModel();
@@ -63,14 +109,21 @@ export default class GMMail extends BaseModel {
     }
 
 
-    private static getSearchObj(form: {_id?: string, content?: string}) {
+    private static getSearchObj(form: SearchMailParam) {
         let searchObj = {};
-        if(form['_id']) searchObj['_id'] = form._id;
-        if(form['content']) searchObj['context'] = { $regex: new RegExp(form.content.toString(), 'i') }
+        if(form.createTimeStart) searchObj['createdAt'] = { $gt: new Date(form.createTimeStart) };
+        if(form.createTimeEnd) searchObj['createdAt'] = { $lt: new Date(form.createTimeEnd) };
+        if(form.serverId) searchObj['receivers.serverId'] = form.serverId;
+        if(form.roleId) searchObj['receivers.roleId'] = form.roleId;
+        if(form.roleName) searchObj['receivers.roleName'] = { $regex: new RegExp(form.roleName.toString(), 'i') }
+        if(form.status) searchObj['status'] = form.status;
+        if(form.mailType) searchObj['mailType'] = form.mailType;
+        if(form.hasGoods != undefined) searchObj['hasGoods'] = form.hasGoods;
+        if(form.title) searchObj['title'] = { $regex: new RegExp(form.title.toString(), 'i') }
         return searchObj
       }
 
-    public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: {_id?: string, content?: string} = {}) {
+    public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: SearchMailParam = {}) {
 
         let searchObj = this.getSearchObj(form);
         let sort = {};
@@ -86,7 +139,7 @@ export default class GMMail extends BaseModel {
 
     }
 
-    public static async countByCondition(form: {_id?: string, content?: string} = {}) {
+    public static async countByCondition(form: SearchMailParam = {}) {
 
         let searchObj = this.getSearchObj(form);
         const result = await GMMailModel.count(searchObj);
@@ -96,7 +149,12 @@ export default class GMMail extends BaseModel {
 
 }
 
-export const GMMailModel = getModelForClass(GMMail);
+export let GMMailModel = getModelForClass(GMMail);
+export function loadGMMailModel(connect: mongoose.Connection) {
+    GMMailModel = getModelForClass(GMMail, {
+        existingConnection: connect
+    });
+}
 
 export interface GMMailType extends Pick<DocumentType<GMMail>, keyof GMMail> { };