✨ feat(后台): 批量邮件

shared/db/GMMail.ts

@@ -10,7 +10,7 @@ import { GMMail as StategyMail } from './ServerStategy';
 import { ServerlistType } from './Serverlist';
 import moment = require('moment');
 
-class Reward {
+class MailReward {
     @prop({ required: true })
     id: number;
     @prop({ required: true })
@@ -26,6 +26,8 @@ export class Receiver {
     roleId?: string;
     @prop({ required: true })
     roleName?: string;
+    @prop({ required: true, type: MailReward, _id: false })
+    rewards?: MailReward[];
 }
 
 export default class GMMail extends BaseModel {
@@ -33,8 +35,8 @@ export default class GMMail extends BaseModel {
     @prop({ required: false})
     hasGoods: boolean;                 // 有效时间，单位小时
 
-    @prop({ required: true, type: Reward, default: [], _id: false })
-    goods: Reward[];
+    @prop({ required: true, type: MailReward, default: [], _id: false })
+    goods: MailReward[];
 
     @prop({ required: true, default: true })
     timeType: MAIL_TIME_TYPE;          // 邮件时间类型

shared/db/Role.ts

@@ -404,8 +404,8 @@ export default class Role extends BaseModel {
         return role;
     }
 
-    public static async findByRoleName(roleName: string, select?: string, getters = false, virtuals = true) {
-        const role: RoleType = await RoleModel.findOne({ roleName }).select(select).lean({ getters, virtuals });
+    public static async findByRoleName(roleName: string, serverId: number, select?: string, getters = false, virtuals = true) {
+        const role: RoleType = await RoleModel.findOne({ roleName, serverId }).select(select).lean({ getters, virtuals });
         return role;
     }