好友：拉黑

shared/consts/constModules/sysConst.ts

@@ -369,4 +369,16 @@ export enum FRIEND_RELATION_TYPE {
   HAS_FRIEND = 2,
   HAS_BLOCKED = 3,
   MYSELF = 4
+}
+
+export enum POPULATE_TYPE {
+  NOT = 0,
+  FRIEND = 1,
+  BLACKLIST = 2
+}
+
+export enum BLOCK_OPEATE {
+  ADD = 1,
+  REMOVE = 2,
+  REMOVE_AND_APPLY = 3
 }

shared/consts/statusCode.ts

@@ -251,7 +251,9 @@ export const STATUS = {
     FRIEND_YOURSELF: { code: 30704, simStr: '不能添加自己为好友' },
     FRIEND_HIS_APPLY_MAX: { code: 30705, simStr: '该玩家申请达上限' },
     FRIEND_SHIP_CREATE_ERROR: { code: 30706, simStr: '创建失败' },
-
+    FRIEND_BLACK_MAX: { code: 30707, simStr: '黑名单数量已达上限' },
+    FRIEND_BLACK_NOT_FOUND: { code: 30709, simStr: '该玩家不在黑名单' },
+    FRIEND_BLACK_HAS_ADD: { code: 30710, simStr: '该玩家已在黑名单' },
 
     // 社交相关状态 40000 - 49999
     // 运营模块相关状态 50000 - 59999

shared/db/FriendRelation.ts

@@ -41,20 +41,42 @@ export default class FriendRelation extends BaseModel {
 
 
     // 获取列表
-    public static async findFriendByRole(roleId: string, populate = true) {
+    public static async findFriendByRole(roleId: string, populateType: number) {
         let document = FriendRelationModel.findOne({ roleId })
             .lean({ getters: true, virtuals: true });
 
-        if (populate) {
+        if (populateType == 1) {
             document
                 .populate('friends.role', ROLE.SHOW_SIMPLE, 'Role')
                 .populate('friends.friendShip', null, 'FriendShip');
+        } else if (populateType == 2) {
+            document
+                .populate('blacklist.role', ROLE.SHOW_SIMPLE, 'Role')
         }
 
         let result: FriendRelationType = await document;
         return result;
     }
 
+    public static async moveFromFriend(roleId: string, friend: RoleType, friendShip: FriendShipType, toBlack: boolean ) {
+        let update = {
+            $pull: { friends: { roleId: friend.roleId } }
+        }
+        if(toBlack) {
+            update['$push'] = { blacklist: { roleId: friend.roleId, role: friend._id, friendShip: friendShip? friendShip._id: null } };
+        }
+
+        let result: FriendRelationType = await FriendRelationModel.findOneAndUpdate({ roleId }, update, { new: true });
+        return result
+    }
+
+    public static async removeFromBlack(roleId: string, frdRoleId: string ) {
+        let result: FriendRelationType = await FriendRelationModel.findOneAndUpdate({ roleId }, {
+            $pull: { blacklist: { roleId: frdRoleId } }
+        }, { new: true });
+        return result
+    }
+
     public static async deleteAccount(roleId: string) {
         let result = await FriendRelationModel.deleteMany({ roleId });
         await FriendRelationModel.updateMany({}, { $pull: { friends: { roleId }, blacklist: { roleId } }});

shared/db/FriendShip.ts

@@ -69,16 +69,24 @@ export default class FriendShip extends BaseModel {
     public static async createFriendShip(roleIdList: string[]) {
         if (roleIdList.length != 2) return false;
         let { roleIdA, roleIdB, roleIds } = this.getRoleIds(roleIdList);
-        console.log(roleIdA, roleIdB, roleIds)
 
         const doc = new FriendShipModel();
         const update = Object.assign(doc.toJSON(), { roleIdA, roleIdB, roleIds });
 
-        const result: FriendShipType = await FriendShipModel.findOneAndUpdate({ roleIds }, update, { upsert: true, new: true }).lean();
+        const result: FriendShipType = await FriendShipModel.findOneAndUpdate({ roleIds }, { $setOnInsert: update }, { upsert: true, new: true }).lean();
 
         return result;
     }
 
+    // 清空亲密度
+    public static async clearValue(roleIdList: string[]) {
+        if (roleIdList.length != 2) return false;
+        let { roleIds } = this.getRoleIds(roleIdList);
+
+        const result: FriendShipType = await FriendShipModel.findOneAndUpdate({ roleIds }, { $set: { friendValue: 0 } }, { new: true }).lean();
+        return result;
+    }
+
     // 查询关系
     public static async deleteAccount(roleId: string) {
         let result = await FriendShipModel.deleteMany({ $or: [{ roleIdA: roleId }, { roleIdB: roleId }] });

shared/db/Role.ts

@@ -353,6 +353,7 @@ export default class Role extends BaseModel {
         const role: RoleType = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskCnt: num}}, {new: true}).lean(lean);
         return role;
     }
+
     // 派遣任务增加刷新次数
     public static async increaseTowerRefCnt(roleId: string, num: number, lean = true) {
         const role: RoleType = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskReCnt: num}}, {new: true}).lean(lean);
@@ -482,8 +483,12 @@ export default class Role extends BaseModel {
     }
 
     // 增加好友数量
-    public static async increaseFriendCnt(roleId: string, inc: number, max: number) {
-        const result = await RoleModel.findOneAndUpdate({ roleId, friendCnt: {$lte: max - inc}}, {$inc: { friendCnt: inc }}, {new: true}).lean();
+    public static async increaseFriendCnt(roleId: string, inc: number, max?: number) {
+        let condition = { roleId };
+        if(max) {
+            condition['friendCnt'] = {$lte: max - inc};
+        }
+        const result = await RoleModel.findOneAndUpdate(condition, {$inc: { friendCnt: inc }}, {new: true}).lean();
         return result;
     }
 
@@ -492,6 +497,12 @@ export default class Role extends BaseModel {
         const result = await RoleModel.findOneAndUpdate({ roleId, recFrdApplyCnt: {$lte: max - inc}}, {$inc: { recFrdApplyCnt: inc }}, {new: true}).lean();
         return result;
     }
+
+    // 增加黑名单数量
+    public static async increaseBlockCnt(roleId: string, blockCnt: number, friendCnt: number, maxBlockCnt: number) {
+        const result = await RoleModel.findOneAndUpdate({ roleId, blockCnt: {$lte: maxBlockCnt - blockCnt}}, {$inc: { blockCnt, friendCnt }}, {new: true}).lean();
+        return result;
+    }
 }
 
 export const RoleModel = getModelForClass(Role);

shared/domain/roleField/friend.ts

@@ -77,4 +77,21 @@ export class FriendListParam extends FriendParams {
     setCanSend(canSend: boolean) {
         this.canSend = canSend;
     }
+}
+
+
+export class BlackListParam extends FriendParams {
+    guildName: string = "";
+    isOnline: boolean = false;
+    quitTime: number = 0;
+
+    constructor(role: RoleType) {
+        super(role);
+        if(role.guildName) this.guildName = role.guildName;
+        this.quitTime = role.quitTime;
+    }
+
+    setOnline(isOnline: boolean) {
+        this.isOnline = isOnline;
+    }
 }