From 5a6d3ad67f6482cee6a00277b1bf7c0af7b7ee68 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 26 Mar 2021 12:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E8=8E=B7=E5=BE=97?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E7=BB=84=E8=BF=87=E9=98=9F=E7=9A=84=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../battle/handler/comBattleHandler.ts        | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 19cd1d903..697e7346c 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -6,7 +6,7 @@ import { difference } from 'underscore';
  * @Last Modified by: 梁桐川
  * @Last Modified time: 2021-03-10 20:15:30
  */
-import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, COM_BTL_QUALITY, MSG_SOURCE, QUALITY_TYPE } from './../../../consts';
+import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, COM_BTL_QUALITY, MSG_SOURCE, QUALITY_TYPE, ROLE_SELECT } from './../../../consts';
 import { getGoodById, getBlueprtComposeByQuality, getBluePrtByQuality, getWarById, getWarIdByBlueprtId } from '../../../pubUtils/gamedata';
 import Role, { RoleModel } from '../../../db/Role';
 import { STATUS } from '../../../consts/statusCode';
@@ -23,6 +23,8 @@ import { addUserToChannel } from '../../../services/roleService';
 import { ChannelUser } from '../../../domain/ChannelUser';
 import { pushComBtlTeamMsg, pushFriendTeamInviteMsg, pushNormalEquipMsg, pushTeamInviteMsg } from '../../../services/chatService';
 import { EXTERIOR } from '../../../pubUtils/dicParam';
+import { getTodayZeroDate } from '../../../pubUtils/timeUtil';
+import { FriendParams } from '../../../domain/roleField/friend';
 
 export default function(app: Application) {
     return new ComBattleHandler(app);
@@ -695,6 +697,33 @@ export class ComBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 
+    /**
+     * @description 最近组队过的队友列表
+     * @param {} msg 
+     * @param {BackendSession} session 
+     */
+    async getRecentTeammates(msg: { }, session: BackendSession) {
+        let roleId = session.get('roleId');
+
+        const teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, getTodayZeroDate());
+        let roleIdList = new Array<string>();
+        for(let { roleIds } of teams) {
+            for(let r of roleIds) {
+                if(r != roleId) roleIdList.push(r);
+            }
+        }
+        const roles = await RoleModel.findRoleByField('roleId', roleIdList, ROLE_SELECT.SHOW_SIMPLE, true);
+        let result = new Array<FriendParams>();
+        for(let role of roles) {
+            if(role.quitTime == role.loginTime) {
+                let r = new FriendParams(role);
+                result.push(r);
+            }
+        }
+
+        return resResult(STATUS.SUCCESS, { list: result });
+    }
+
     /**
      * @description 藏宝图合成
      * @param {{original: Array<{id: number, count: number}>}} msg