Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

game-server/app/servers/role/handler/friendHandler.ts

@@ -1,5 +1,5 @@
 import { Application, BackendSession, ChannelService } from "pinus";
-import { resResult, getRandEelm, getResStr, shouldRefresh } from "../../../pubUtils/util";
+import { resResult, getRandEelm, getResStr, shouldRefresh, getRefTime, sortArrRandom } from "../../../pubUtils/util";
 import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, EQUIP_SELECT, REDIS_KEY } from "../../../consts";
 import { RoleModel, RoleType } from "../../../db/Role";
 import { getBeforeHourSeconds } from "../../../pubUtils/timeUtil";
@@ -43,6 +43,12 @@ export class FriendHandler {
         const { lv, serverId: myServerId, userInfo: { serverType: myServerType } } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER); 
         let allList = await RoleModel.getRecommedList(lv - FRIEND.FRIEND_RECONMMEND_LEVEL, lv + FRIEND.FRIEND_RECONMMEND_LEVEL, day);
 
+        // 筛掉自己今天申请过的人
+        let applyList = await FriendApplyModel.getSentApplyList(roleId, getRefTime(new Date(), 0));
+        allList = allList.filter(cur => {
+            return !applyList.find(ccur => ccur.roleId == cur.roleId);
+        });
+
         let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
 
         let myServerList = new Array<FriendRecommendParams>();
@@ -80,6 +86,8 @@ export class FriendHandler {
                 list1 = getRandEelm(myServerList, FRIEND.FRIEND_RECONMMEND_NUM - list2.length);
             }
         }
+        list1 = sortArrRandom(list1);
+        list2 = sortArrRandom(list2);
         
         let list = list1.concat(list2);