邮件：修改邮件逻辑

game-server/app/services/guildService.ts

@@ -9,14 +9,10 @@ import { SystemConfigModel } from "../db/SystemConfig";
 import { nowSeconds } from "../pubUtils/timeUtil";
 import { pinus, BackendSession, FrontendOrBackendSession } from "pinus";
 import { ARMY } from "../pubUtils/dicParam";
-import { sendMail } from "./mailService";
+import { sendMailByContent } from "./mailService";
 import { initSingleRank, getRoleOnlineInfo, updateUserInfo, isRoleOnline } from "./redisService";
-import { GuildRankParam, GuildLeader } from "../domain/rank";
 import { lockData, lockDataNoRetry } from '../services/redLockService';
 import { ErrLogModel } from '../db/ErrLog';
-import { MailType, MailModel } from '../db/Mail';
-import { pushMail } from '../pubUtils/interface';
-import { getMailContent } from '../services/mailService';
 import { DATA_NAME } from '../consts/dataName';
 import { addRoleToGuildChannel } from "./chatService";
 import { Rank } from "./rankService";
@@ -223,25 +219,20 @@ export async function getUserGuildWithRefActive(roleId: string, select?: string,
     const now = new Date();
     let isRefDaily = shouldRefresh(refTimeDaily, now);
     if (isRefDaily) {
-        let mails = new Array<MailType>();
-        let pushMessage = new Array<pushMail>();
         wishGoods.map(async function ({ donateNames, goodId, drawCnt }) {
             let goodInfo = getGoodById(goodId)
             if (!goodInfo)
                 return;
             for (let i = 0; i < drawCnt; i++) {
                 let donateName = donateNames[donateNames.length - i - 1];
-                await getMailContent(roleId, MAIL_TYPE.WISH_POOL_REWARD, [donateName, goodInfo.name], [{ id: goodId, count: drawCnt }], mails, pushMessage);
-            }
-        });
-        if (!!mails.length) {
-            await MailModel.addMails(mails);
-            if (!notPush) {
-                pushMessage.forEach(({ route, data, uids }) => {
-                    pinus.app.channelService.pushMessageByUids(route, resResult(STATUS.SUCCESS, { mails: data }), uids);
+                await sendMailByContent(MAIL_TYPE.WISH_POOL_REWARD, roleId, { 
+                    params: [donateName, goodInfo.name],
+                    goods: [{ id: goodId, count: drawCnt }],
+                    notPush
                 });
             }
-        }
+        });
+
         receivedActive = []; refTimeDaily = now; activeDaily = 0; activeRecord = []; wishGoods = [];
         let receiveBoxs = [], wishDntCnt = 0, donateCnt = 0;
         userGuild = await UserGuildModel.updateInfo(roleId, { receivedActive, refTimeDaily, activeDaily, activeRecord, wishGoods, receiveBoxs, wishDntCnt, donateCnt }, {}, select);
@@ -304,7 +295,7 @@ export async function settleGuildWeekly() {
                     count: Math.ceil(cur.count * jobActiveRatio)
                 }
             });
-            await sendMail(MAIL_TYPE.GUILD_ACTIVE_REWARD, roleId, '系统', [], reward);
+            await sendMailByContent(MAIL_TYPE.GUILD_ACTIVE_REWARD, roleId, { goods: reward });
             // 任务
             await checkTask(roleId, null, null, TASK_TYPE.GUILD_JOB, 1, false, { job });
         }