邮件：修改邮件逻辑

game-server/app/services/activity/monthlyTicketService.ts

@@ -6,11 +6,7 @@ import { MonthlyTicketData } from '../../domain/activityField/monthlyTicketField
 import { addReward, stringToRewardInter, stringToRewardParam } from './giftPackageService';
 import moment = require('moment');
 import { ServerlistModel } from '../../db/Serverlist';
-import { getMailContent } from './../mailService';
-import { MailModel, MailType } from '../../db/Mail';
-import { pushMail } from '../../pubUtils/interface';
-import { pinus } from 'pinus';
-import { resResult } from '../../pubUtils/util';
+import { sendMailByContent } from './../mailService';
 
 /**
    * 获取活动数据
@@ -38,17 +34,10 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
     if ((playerData.price > 0 && playerData.isOpen) || playerData.price === 0) {
         if (playerData.todayIndex - 1 > playerData.dayIndex) {//过期还没领取
             //下发邮件奖励
-            let mails = new Array<MailType>();
-            let pushMessage = new Array<pushMail>();
             for (let i = playerData.dayIndex + 1; i < playerData.todayIndex; i++) {
                 let goods = stringToRewardInter(playerData.baseReward)
-                await getMailContent(roleId, MAIL_TYPE.MONTHLY_REWARD, [], goods, mails, pushMessage);
+                await sendMailByContent(MAIL_TYPE.MONTHLY_REWARD, roleId, { params: [], goods });
             }
-
-            await MailModel.addMails(mails);
-            pushMessage.forEach(({ route, data, uids }) => {
-                pinus.app.channelService.pushMessageByUids(route, resResult(STATUS.SUCCESS, { mails: data }), uids);
-            });
             await ActivityMonthlyTicketModel.setDayIndex(serverId, roleId, playerData.activityId, playerData.todayIndex - 1);
             playerData.dayIndex = playerData.todayIndex - 1;
         }