From 8505b24696015b901f0b156a0edb1062a85fbc80 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 2 Sep 2021 21:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=88=E6=88=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/activity/handler/gachaHandler.ts   | 14 +++++++++-----
 .../app/servers/role/handler/heroHandler.ts        |  5 -----
 shared/pubUtils/roleUtil.ts                        |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts
index f94698a24..078cf8570 100644
--- a/game-server/app/servers/activity/handler/gachaHandler.ts
+++ b/game-server/app/servers/activity/handler/gachaHandler.ts
@@ -30,11 +30,15 @@ export class GachaHandler {
     * @memberof GachaHandler
     */
     async getGachaList(msg: {}, session: BackendSession) {
-        const { } = msg;
-        const roleId: string = session.get('roleId');
-        const list = await getGachaList(roleId);
-
-        return resResult(STATUS.SUCCESS, { list });
+        try {
+            const { } = msg;
+            const roleId: string = session.get('roleId');
+            const list = await getGachaList(roleId);
+    
+            return resResult(STATUS.SUCCESS, { list });
+        }catch(e) {
+            return resResult(STATUS.WRONG_PARMS, {err:e.stack})
+        }
     }
 
     /**
diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index bb7edbe79..d19c54b6a 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -99,7 +99,6 @@ export class HeroHandler {
 
     // 武将碎片合成
     public async compose(msg: { hid: number }, session: BackendSession) {
-        try {
             
         let roleId: string = session.get('roleId');
         let roleName: string = session.get('roleName');
@@ -124,10 +123,6 @@ export class HeroHandler {
 
         pushComposeOrangeHero(roleId, roleName, serverId, heroes[0]);
         return resResult(STATUS.SUCCESS, { curHero: heroes[0] });
-
-     }catch(e) {
-         return resResult(STATUS.WRONG_PARMS, {err: e.stack})
-     }
     }
 
     // 武将升级
diff --git a/shared/pubUtils/roleUtil.ts b/shared/pubUtils/roleUtil.ts
index b1a3a9155..406a6de2b 100644
--- a/shared/pubUtils/roleUtil.ts
+++ b/shared/pubUtils/roleUtil.ts
@@ -131,7 +131,7 @@ export class UpdateHeroes {
         // 更新军团信息
         if(this.guild) {
             let r = new Rank(REDIS_KEY.GUILD_INFO, { code: this.guild.code });
-            await r.generParamAndSet(REDIS_KEY.GUILD_INFO, { roleId }, { guild: this.guild });
+            await r.generParamAndSet(REDIS_KEY.GUILD_INFO, { guildCode: this.guild.code }, { guild: this.guild });
         }
         // 武将数量
         if(this.incHeroNum > 0) {