好友：赠送领取爱心

shared/db/FriendRelation.ts

@@ -2,9 +2,9 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, mongoose, Ref } from '@typegoose/typegoose';
 import Role, { RoleType } from './Role';
 import FriendShip, { FriendShipType } from './FriendShip';
-import { ROLE } from '../consts';
+import { ROLE, POPULATE_TYPE } from '../consts';
 
-class Relation {
+export class Relation {
     @prop({ required: true, default: '' })
     roleId: string;     // 对方玩家id
     @prop({ required: true, ref: 'Role', type: mongoose.Schema.Types.ObjectId })
@@ -45,13 +45,15 @@ export default class FriendRelation extends BaseModel {
         let document = FriendRelationModel.findOne({ roleId })
             .lean({ getters: true, virtuals: true });
 
-        if (populateType == 1) {
+        if (populateType == POPULATE_TYPE.FRIEND) {
             document
                 .populate('friends.role', ROLE.SHOW_SIMPLE, 'Role')
                 .populate('friends.friendShip', null, 'FriendShip');
-        } else if (populateType == 2) {
+        } else if (populateType == POPULATE_TYPE.BLACKLIST) {
             document
                 .populate('blacklist.role', ROLE.SHOW_SIMPLE, 'Role')
+        } else if (populateType == POPULATE_TYPE.FRIENDSHIP) {
+            document.populate('friends.friendShip', null, 'FriendShip');
         }
 
         let result: FriendRelationType = await document;