From d780f8e5b40a3fe0fec57a468509e81627ef28d8 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 16 Jul 2021 17:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/gm/handler/gmHandler.ts |  2 +-
 game-server/app/services/gmService.ts           | 13 +++++++++++--
 gm-server/app/controller/game.ts                |  1 -
 gm-server/app/service/Game.ts                   |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts
index 2dd350bdc..94c244887 100644
--- a/game-server/app/servers/gm/handler/gmHandler.ts
+++ b/game-server/app/servers/gm/handler/gmHandler.ts
@@ -203,7 +203,7 @@ export class GmHandler {
         const uid = session.get('uid');
         const maintenance = await MaintenanceModel.updateStatusByCode(code, false, uid);
         if(!maintenance) return resResult(STATUS.WRONG_PARMS);
-        await stopMaintenance(maintenance);
+        await stopMaintenance(maintenance, uid);
         
         return resResult(STATUS.SUCCESS,);
     }
diff --git a/game-server/app/services/gmService.ts b/game-server/app/services/gmService.ts
index 2a17473dd..6c11f4020 100644
--- a/game-server/app/services/gmService.ts
+++ b/game-server/app/services/gmService.ts
@@ -9,6 +9,8 @@ import { pinus } from "pinus";
 import { getWorldChannelSid } from "./chatChannelService";
 import { ServerlistModel } from "../db/Serverlist";
 import { NoticeModel, NoticeType } from "../db/Notice";
+import { SendMailFun } from "./mailService";
+import { GMMailType } from '../db/GMMail';
 
 // —————————————— 跑马灯 —————————————— //
 // 初始
@@ -146,8 +148,8 @@ async function startMaintenance(maintenance: MaintenanceType, startJob?: Job) {
 }
 
 // 停止维护
-export async function stopMaintenance(maintenance: MaintenanceType) {
-    let { serverIds, notice, marquee } = maintenance;
+export async function stopMaintenance(maintenance: MaintenanceType, uid: number) {
+    let { serverIds, notice, marquee, mail } = maintenance;
     // 更新serverlist上的status
     await ServerlistModel.updateByServerIds(serverIds, { serverStatus: SERVER_STATUS.HOT });
     // 更新notice的isEnable
@@ -164,4 +166,11 @@ export async function stopMaintenance(maintenance: MaintenanceType) {
     if(marquee) {
         await cancelMarquee((<MarqueeType>marquee).code);
     }
+    console.log('*****', JSON.stringify(mail));
+    if(mail) {
+        let f = new SendMailFun();
+        await f.setWithGmMail((<GMMailType>mail)._id);
+        await f.sendToServer(serverIds);
+        await f.saveRecord(uid);
+    }
 }
\ No newline at end of file
diff --git a/gm-server/app/controller/game.ts b/gm-server/app/controller/game.ts
index b3767f336..ece2331ea 100644
--- a/gm-server/app/controller/game.ts
+++ b/gm-server/app/controller/game.ts
@@ -42,7 +42,6 @@ export default class GameController extends Controller {
       ctx.body = ctx.service.utils.resResult(STATUS.GM_JSON_FORMAT_ERR);
       return
     }
-    console.log(goods)
 
     ctx.body = await ctx.service.game.updateMaintenance(
       {...values, startTime: new Date(values.startTime)}, 
diff --git a/gm-server/app/service/Game.ts b/gm-server/app/service/Game.ts
index 691e2bb41..1282422a3 100644
--- a/gm-server/app/service/Game.ts
+++ b/gm-server/app/service/Game.ts
@@ -81,7 +81,7 @@ export default class Game extends Service {
             let curEnv = serverEnv.find(cur => cur.env == this.app.config.env);
     
             let marqueeResult = await MarqueeModel.createData({ ...marquee, serverIds: values.serverIds, type: MARQUEE_TYPE.SCHEDULE, isRunning: false }, ctx.user?.uid);
-            let noticeResult = await NoticeModel.updateNotice('new', { ...notice, type: 1, sort: 1000, serverType: curEnv?.serverType, isEnable: true }, ctx.user?.uid);
+            let noticeResult = await NoticeModel.updateNotice('new', { ...notice, type: 1, sort: 1000, serverType: curEnv?.serverType, isEnable: false }, ctx.user?.uid);
             let mailResult = await GMMailModel.addMail({ ...mail, useTempTime: true }, ctx.user?.uid);
             await MaintenanceModel.createData(values, marqueeResult, noticeResult, mailResult);
         } else {