测试：添加公会

2021-07-07 16:25:52 +08:00
parent cc5cdd347e
commit 5a948d1741
2 changed files with 42 additions and 13 deletions
@@ -9,6 +9,12 @@ import { addItems, handleCost } from '../../../services/rewardService';
 import { getSimpleRoleInfo } from '../../../services/roleService';
 import { getRoleOnlineInfo } from '../../../services/redisService';
 import { lockData } from '../../../services/redLockService';
+import { GuildModel } from '../../../db/Guild';
+import { RoleModel, RoleType } from '../../../db/Role';
+import { openGuildRefine } from '../../../services/guildRefineService';
+import { unlockTrain } from '../../../services/guildTrainService';
+import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildApplyModel } from '../../../db/UserGuildApply';

 export default function (app: Application) {
    return new AuctionHandler(app);
@@ -76,7 +82,7 @@ export class AuctionHandler {
                const { roleName: buyerName } = await getSimpleRoleInfo(curBuyer);
                const { isOnline, sid: buyerSid } = await getRoleOnlineInfo(curBuyer);
                await addItems(curBuyer, buyerName, buyerSid, [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.GOLD), count: curPrice }]);
-                if(isOnline) {
+                if (isOnline) {
                    this.channelService.pushMessageByUids('onAuctionOver', resResult(STATUS.SUCCESS, { code }), [{ uid: curBuyer, sid: buyerSid }]);
                }
            }
@@ -215,7 +221,25 @@ export class AuctionHandler {

        const guildCode: string = session.get('guildCode');
        const serverId: number = session.get('serverId');
-        if (!guildCode) return resResult(STATUS.GUILD_NOT_FOUND)
+        if (!guildCode) {//创建公会
+            const roleId = session.get('roleId');
+            const role: RoleType = await RoleModel.findByRoleId(roleId);
+            // 创建公会
+            const name = '测试公会'
+            const icon = 1
+            const notice = '测试公会'
+            const guild = await GuildModel.createGuild({ name, icon, notice }, role, serverId);
+            if (!guild) return resResult(STATUS.GUILD_CREATE_ERROR);
+            guild.leader = <RoleType>guild.leader;
+            //创建科技树
+            await openGuildRefine(guild.code);
+            await unlockTrain(guild.code, 1);
+            const userGuild = await UserGuildModel.createUserGuild(guild.code, role, true);
+            if (!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
+
+            await RoleModel.joinGuild(roleId, guild.code, guild.name);
+            await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
+        }

        const result = await genAuction(guildCode, sourceType, sourceCode, serverId, rewards);
        if (!result) {