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

✨ feat(db): 修改role表数据库操作方式

Browse Source
This commit is contained in:
liangtongchuan
2023-05-06 15:48:16 +08:00
parent 2ff9f8c5f1
commit e65efa4192
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
game-server/app/services/guildService.ts
View File

@@ -2,7 +2,7 @@ import { gameData, getGuildActiveWeekReward, getGuildActiveByIdAndType, getGoodB
import { GuildModel, GuildType, GuildUpdateParam } from "../db/Guild";
import { deltaDays, resResult, shouldRefresh } from "../pubUtils/util";
import { STATUS, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, CHAT_SERVER, TASK_TYPE, COUNTER, GUILD_REC_TYPE, PUSH_ROUTE, WAR_TYPE, USER_GUILD_STATUS } from "../consts";
import { RoleModel, RoleType } from "../db/Role";
import Role, { RoleType } from "../db/Role";
import { UserGuildModel, UserGuildType, WishGood } from "../db/UserGuild";
import { UserGuildApplyModel } from "../db/UserGuildApply";
import { getZeroPointD, getZeroPointOfTime, getZeroPointOfTimeD, nowSeconds } from "../pubUtils/timeUtil";
@@ -94,7 +94,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
let res: any = await lockData(serverId, DATA_NAME.JOIN_GUILD, code);// 加锁
if (!!res.err) return { status: -1, resResult: resResult(STATUS.REDLOCK_ERR) };
let role = await RoleModel.findByRoleId(roleId);
let role = await Role.findByRoleId(roleId);
if (role.hasGuild) {
res.releaseCallback();//解锁
return { status: -1, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
@@ -113,7 +113,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
await updateUserInfo(REDIS_KEY.GUILD_INFO, guild.code, [{ field: 'guildCe', value: guild.guildCe }])
}
role = await RoleModel.joinGuild(roleId, code, guildName, false);
role = await Role.joinGuild(roleId, code, guildName, false);
if (!role) {
await GuildModel.notAddMember(code, roleId, role.ce);
res.releaseCallback();//解锁
@@ -265,7 +265,7 @@ async function isIWishedInMyTodayQuitGuilds(roleId: string): Promise<Boolean> {
* @param {string} roleId
*/
export async function canWishToday(roleId: string): Promise<Boolean> {
let role = await RoleModel.findByRoleId(roleId);
let role = await Role.findByRoleId(roleId);
if (!role) {
return false;
}