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

fix军团：获取邀请列表bug

Browse Source
This commit is contained in:
luying
2021-01-26 17:28:44 +08:00
parent 02b21f27e0
commit af1cef06c0
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -449,7 +449,6 @@ export class GuildHandler {
const list = result.map(cur => {
let guild = <GuildType>cur.guild;
let leader = <RoleType>guild.leader;
delete guild.leader;
delete cur.guild;
return { applyCode: cur.applyCode, ...guild, leader: leader.roleName };
});
@@ -513,7 +512,6 @@ export class GuildHandler {
select.push('auth', 'activeWeekly activeUpdateTime');
}
let list = await UserGuildModel.getListByGuild(code, select.join(' '), { auth: 1 });
console.log('**', JSON.stringify(list))
let result = list.map(cur => {
let role = <RoleType>cur.role;
delete role._id;

1
game-server/app/services/redisService.ts
View File

@@ -89,7 +89,6 @@ async function setRankRedisFromDb(type: string, serverId: number) {
for(let { code, icon, name, lv, leader, activeWeekly = 0, activeUpdateTime = 0 } of ranks) {
let _leader = <RoleType>leader;
let { roleName, title, sHid, headHid, lv: leaderLv } = _leader;
console.log(activeWeekly, activeUpdateTime * 1000)
await client.zaddAsync(getKeyName(REDIS_KEY.GUILD_ACTIVE_RANK, serverId), encodeScoreWithTime(activeWeekly, activeUpdateTime * 1000 ), code);
let rankParam = new GuildRankParam(icon, name, lv, { roleName, title, sHid, headHid, lv: leaderLv });
await redisUserInfoAdd(REDIS_KEY.GUILD_INFO, code, rankParam);

5
shared/db/Guild.ts
View File

@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typ
import Role, { RoleType } from './Role';
import { genCode } from '../pubUtils/util';
import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE } from '../consts';
import { getCurWeekTime } from '../pubUtils/timeUtil';
import { getCurWeekTime, nowSeconds } from '../pubUtils/timeUtil';
class Structure {
@prop({ required: true })
@@ -60,7 +60,7 @@ export default class Guild extends BaseModel {
@prop({ required: true, default: 0 })
activeWeekly: number;
@prop({ required: true, default: Date.now() })
@prop({ required: true, default: nowSeconds() })
activeUpdateTime: number;
@prop({ required: true, default: new Date(), select: false })
@@ -93,6 +93,7 @@ export default class Guild extends BaseModel {
delete update._id;
const code = genCode(6);
const result: GuildType = await GuildModel.findOneAndUpdate({ code }, update, { upsert: true, new: true })
.select({ _id: 0, __v: 0, createdAt: 0, updatedAt: 0 })
.populate('leader', { roleId: 1, roleName: 1, sHid: 1, headHid: 1, lv: 1, loginTime: 1, ce: 1, title: 1, _id: 0 }, 'Role')
.lean();

2
shared/db/UserGuildApply.ts
View File

@@ -94,7 +94,7 @@ export default class UserGuildApply extends BaseModel {
const lastApply = await this.findByCode(lastApplyCode);
condition["createdAt"] = { $lt: lastApply.createdAt };
}
const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition)
const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition, {_id: 0})
.sort({ createdAt: -1 })
.select('applyCode guild')
.populate({