邮件：修改邮件逻辑

game-server/app/services/guildTrainService.ts

@@ -13,8 +13,9 @@ import { resResult, getRandSingleEelm } from '../pubUtils/util';
 import { STATUS } from '../consts/statusCode';
 import { GuildTrainReportModel } from '../db/GuildTrainReport';
 import { DATA_NAME } from '../consts/dataName';
-import { getMailContent } from './mailService';
+import { sendMailByContent } from './mailService';
 import { MAIL_TYPE } from '../consts';
+import { getGuildChannelSid } from './chatChannelService';
 /**
  * 获得userGuild，并检查，是否需要每日重置购买挑战次数和今日挑战次数，已经检查是否需要每周重置练兵场
  * @param roleId 
@@ -151,8 +152,7 @@ export async function resetTrain(code: string, serverId: number) {
     }
     const userGuildList = await UserGuildModel.getListByGuild(code, 'trainRewards', {});
     const guildTrains = await GuildTrainModel.getGuildTrainBoxs(code);
-    let mails = new Array<MailType>();
-    let pushMessage = [];
+
     let { shilianRewardRatio } = getTrainBaseByLv(GUILD_STRUCTURE.TRAIN);
     //结算未领取的宝箱奖励发送到邮件中
     userGuildList.forEach(async function ({roleId, trainRewards}) {
@@ -177,14 +177,15 @@ export async function resetTrain(code: string, serverId: number) {
             }
         }
         if (!!goods.length) {           
-            await getMailContent(roleId, MAIL_TYPE.GUILD_TRAIN_REWARD, [], goods, mails, pushMessage);
+            await sendMailByContent(MAIL_TYPE.GUILD_TRAIN_REWARD, roleId, {
+                params: [], goods
+            });
         }
     });
-    await MailModel.addMails(mails);
-    pushMessage.forEach(({route, data, uids })=>{
-        pinus.app.channelService.pushMessageByUids(route, resResult(STATUS.SUCCESS, { mails:data }), uids);
-        pinus.app.channelService.pushMessageByUids('onGuildTainReset', resResult(STATUS.SUCCESS, {}), uids);//通知在线玩家练兵场重置，
-    });
+    
+    let chatSid = await getGuildChannelSid(code);
+    pinus.app.rpc.chat.guildRemote.sendTrainReset.toServer(chatSid, code);
+
     await GuildTrainModel.resetGuildTrain(code);//将开启的练兵场锁定
     await unlockTrain(code, 1);//开启练兵场1级
     await UserGuildModel.resetTrainUserGuild(code);//重置玩家的挑战次数和购买挑战次数