From dd1dbff4e62e82e2fbc315cc9900be866fa72095 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Fri, 26 Mar 2021 11:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=EF=BC=9A=E7=BB=84=E9=98=9F?=
 =?UTF-8?q?=E7=A7=81=E4=BA=BA=E9=82=80=E8=AF=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/battle/handler/comBattleHandler.ts  | 17 ++++++++++++++++-
 game-server/app/services/chatService.ts         | 11 +++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 9e65bb50d..19cd1d903 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -21,7 +21,7 @@ import { setAp } from '../../../services/actionPointService';
 import { roleLevelup } from '../../../services/normalBattleService';
 import { addUserToChannel } from '../../../services/roleService';
 import { ChannelUser } from '../../../domain/ChannelUser';
-import { pushComBtlTeamMsg, pushNormalEquipMsg, pushTeamInviteMsg } from '../../../services/chatService';
+import { pushComBtlTeamMsg, pushFriendTeamInviteMsg, pushNormalEquipMsg, pushTeamInviteMsg } from '../../../services/chatService';
 import { EXTERIOR } from '../../../pubUtils/dicParam';
 
 export default function(app: Application) {
@@ -680,6 +680,21 @@ export class ComBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 
+    /**
+     * @description 邀请队友
+     * @param {{ teamCode: string, targetRoleId: string }} msg
+     * @param {BackendSession} session
+     * @memberof ComBattleHandler
+     */
+    async inviteTeammate(msg: { teamCode: string, targetRoleId: string }, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let roleName = session.get('roleName');
+        const { teamCode, targetRoleId } = msg;
+        const msgData = await pushFriendTeamInviteMsg(roleId, roleName, teamCode, targetRoleId);
+        if (!msgData) return resResult(STATUS.WRONG_PARMS);
+        return resResult(STATUS.SUCCESS);
+    }
+
     /**
      * @description 藏宝图合成
      * @param {{original: Array<{id: number, count: number}>}} msg
diff --git a/game-server/app/services/chatService.ts b/game-server/app/services/chatService.ts
index a6f07b3a9..2a7dc8614 100644
--- a/game-server/app/services/chatService.ts
+++ b/game-server/app/services/chatService.ts
@@ -321,6 +321,17 @@ export async function pushTeamInviteMsg(roleId: string, roleName: string, server
     return { msgDataWorld, msgDataGuild };
 }
 
+/**
+ * @description 发送组队私人邀请消息
+ * @param {string} teamCode 队伍唯一标识
+ */
+ export async function pushFriendTeamInviteMsg(roleId: string, roleName: string, teamCode: string, targetRoleId) {
+    const msgData = await createPrivateMsg(roleId, roleName, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, teamCode, targetRoleId, null);
+    await pushMsgToRole(msgData);
+    return msgData;
+}
+
+
 export async function createAccuseData(roleId: string, targetRoleId: string, targetMsgCode: string, reason: number) {
     const data: AccueseParam = {
         roleId, targetRoleId, targetMsgCode, reason