xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

好友：list添加类型返回

Browse Source
This commit is contained in:
luying
2021-02-06 11:15:18 +08:00
parent 9a71f6258a
commit d9bea0444c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
game-server/app/servers/role/handler/friendHandler.ts
View File

@@ -152,16 +152,21 @@ export class FriendHandler {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let list = await FriendApplyModel.getApplyList(roleId); let list = await FriendApplyModel.getApplyList(roleId);
let result = new Array<FriendApplyParams>(); let result = new Array<FriendApplyParams>();
for(let apply of list) { for(let apply of list) {
let friend = <RoleType>apply.friend; let friend = <RoleType>apply.friend;
let type = getRecommendType(myFriendRelation, roleId, friend.roleId);
let param = new FriendApplyParams(apply.applyCode, friend); let param = new FriendApplyParams(apply.applyCode, friend);
let { serverId, userInfo: { serverType }} = friend; let { serverId, userInfo: { serverType }} = friend;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
param.setType(type);
result.push(param); result.push(param);
} }
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
@@ -217,6 +222,7 @@ export class FriendHandler {
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_FRIEND);
list.push(param); list.push(param);
resultApplyCodeList.push(apply.applyCode); resultApplyCodeList.push(apply.applyCode);
} }
@@ -261,6 +267,8 @@ export class FriendHandler {
let isOnline = await isRoleOnline(friendRole.roleId); let isOnline = await isRoleOnline(friendRole.roleId);
param.setOnline(isOnline); param.setOnline(isOnline);
param.setType(FRIEND_RELATION_TYPE.HAS_FRIEND);
list.push(param); list.push(param);
} }
@@ -295,6 +303,8 @@ export class FriendHandler {
let { serverId, userInfo: { serverType }} = friendRole; let { serverId, userInfo: { serverType }} = friendRole;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
list.push(param); list.push(param);
@@ -353,6 +363,7 @@ export class FriendHandler {
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
list.push(param); list.push(param);
frdRoleIds.push(roleId); frdRoleIds.push(roleId);
} else if (type == BLOCK_OPEATE.REMOVE_FRIEND) { // 仅移除 } else if (type == BLOCK_OPEATE.REMOVE_FRIEND) { // 仅移除

9
shared/domain/roleField/friend.ts
View File

@@ -12,6 +12,7 @@ export class FriendParams {
title: number; title: number;
serverId: number; serverId: number;
serverName: string; serverName: string;
type: number;
constructor(role: RoleType) { constructor(role: RoleType) {
this.roleId = role.roleId; this.roleId = role.roleId;
@@ -27,12 +28,15 @@ export class FriendParams {
this.serverId = serverId; this.serverId = serverId;
this.serverName = serverName; this.serverName = serverName;
} }
setType(type: number) {
this.type = type;
}
} }
export class FriendRecommendParams extends FriendParams { export class FriendRecommendParams extends FriendParams {
friendCnt: number = 0; friendCnt: number = 0;
recFrdApplyCnt: number = 0; recFrdApplyCnt: number = 0;
type: number;
constructor(role: RoleType) { constructor(role: RoleType) {
super(role); super(role);
@@ -40,9 +44,6 @@ export class FriendRecommendParams extends FriendParams {
if(role.recFrdApplyCnt) this.recFrdApplyCnt = role.recFrdApplyCnt; if(role.recFrdApplyCnt) this.recFrdApplyCnt = role.recFrdApplyCnt;
} }
setType(type: number) {
this.type = type;
}
} }
export class FriendApplyParams extends FriendParams { export class FriendApplyParams extends FriendParams {