From ee63e36511ed3bf8aba5e3e9f34140ea03086966 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Wed, 26 May 2021 16:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=8Cbug=E5=A4=84=E7=90=86,=20?=
 =?UTF-8?q?=E7=BC=96=E9=98=9F=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E5=92=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A5=E5=BA=93=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/hero/ReplacePurpleMansionSealHandler.java    | 6 +++---
 .../com/ljsd/jieling/logic/dao/PurpleMansionSeal.java    | 9 +--------
 .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 8 +++++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/ReplacePurpleMansionSealHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/ReplacePurpleMansionSealHandler.java
index 4507b917f..ccf52a61d 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/ReplacePurpleMansionSealHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/ReplacePurpleMansionSealHandler.java
@@ -1,10 +1,8 @@
 package com.ljsd.jieling.handler.hero;
 
-import com.google.protobuf.GeneratedMessage;
 import com.ljsd.jieling.exception.ErrorCode;
 import com.ljsd.jieling.exception.ErrorCodeException;
 import com.ljsd.jieling.handler.BaseHandler;
-import com.ljsd.jieling.logic.dao.Hero;
 import com.ljsd.jieling.logic.dao.PurpleMansionSeal;
 import com.ljsd.jieling.logic.dao.UserManager;
 import com.ljsd.jieling.logic.dao.root.User;
@@ -18,7 +16,6 @@ import rpc.protocols.MessageTypeProto;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @Author hj
@@ -73,6 +70,7 @@ public class ReplacePurpleMansionSealHandler extends BaseHandler<HeroInfoProto.R
             PurpleMansionSeal oldSeal = sealMap.get(oneSeal);
             if (oldSeal != null){
                 oldSeal.setState(0);
+                user.getHeroManager().putPurpleMansionSeal(oldSeal);
             }
             // 新神印状态修改
             seal.setState(1);
@@ -99,6 +97,8 @@ public class ReplacePurpleMansionSealHandler extends BaseHandler<HeroInfoProto.R
             seal.setSubId(heroId);
         }
 
+        user.getHeroManager().putPurpleMansionSeal(seal);
+
         // 返回最新神印列表
         List<CommonProto.PurpleMansionSeal> sealInfo = CBean2Proto.getPurpleMansionSealInfo(user);
         HeroInfoProto.ReplacePrupleMansionSealResponse build = HeroInfoProto.ReplacePrupleMansionSealResponse.newBuilder().addAllSealList(sealInfo).build();
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java
index aa6d7a44e..f77c9ff47 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java
@@ -7,10 +7,7 @@ package com.ljsd.jieling.logic.dao;
  * @Param $
  * @return $
  **/
-
-import com.ljsd.common.mogodb.MongoBase;
-
-public class PurpleMansionSeal extends MongoBase {
+public class PurpleMansionSeal{
 
     /**
      * 印章id
@@ -44,7 +41,6 @@ public class PurpleMansionSeal extends MongoBase {
 
     public void setSealId(int sealId) {
         this.sealId = sealId;
-        updateString("sealId", sealId);
     }
 
     public int getType() {
@@ -53,7 +49,6 @@ public class PurpleMansionSeal extends MongoBase {
 
     public void setType(int type) {
         this.type = type;
-        updateString("type", type);
     }
 
     public String getSubId() {
@@ -62,7 +57,6 @@ public class PurpleMansionSeal extends MongoBase {
 
     public void setSubId(String subId) {
         this.subId = subId;
-        updateString("subId", subId);
     }
 
     public int getState() {
@@ -71,6 +65,5 @@ public class PurpleMansionSeal extends MongoBase {
 
     public void setState(int state) {
         this.state = state;
-        updateString("state", state);
     }
 }
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
index ed4a4e1ba..5715528dd 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
@@ -828,10 +828,16 @@ public class CBean2Proto {
         values.forEach(v->{
             // 使用中的神印
             if (v.getState() == 1){
+                int heroTid = 0;
+                if (v.getType() == 1){
+                    Hero hero = user.getHeroManager().getHero(v.getSubId());
+                    heroTid = hero.getTemplateId();
+                }
+
                 CommonProto.PurpleSealShowInfo builder = CommonProto.PurpleSealShowInfo.newBuilder()
                         .setId(v.getSealId())
                         .setType(v.getType())
-                        .setHeroTId(0)
+                        .setHeroTId(heroTid)
                         .build();
                 list.add(builder);
             }