From 125f4b30f764f8c2e619d90245dc808f71e8101d Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 6 Jun 2023 15:14:03 +0800 Subject: [PATCH] reputation errdata --- modules/reputation/api_getattrs.go | 5 ++++- modules/reputation/api_reset.go | 5 ++++- modules/reputation/api_upgrade.go | 24 ++++++++++++++++-------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/modules/reputation/api_getattrs.go b/modules/reputation/api_getattrs.go index a3978b83f..a33256a65 100644 --- a/modules/reputation/api_getattrs.go +++ b/modules/reputation/api_getattrs.go @@ -17,7 +17,10 @@ func (this *apiComp) Getattrs(session comm.IUserSession, req *pb.ReputationTalen reputation := this.module.modelReputation.getDBReputation(uid) if reputation == nil { - code = pb.ErrorCode_DataNotFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DataNotFound, + Title: pb.ErrorCode_DataNotFound.ToString(), + } return } diff --git a/modules/reputation/api_reset.go b/modules/reputation/api_reset.go index e909c0516..50092770e 100644 --- a/modules/reputation/api_reset.go +++ b/modules/reputation/api_reset.go @@ -19,7 +19,10 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.ReputationTalentre uid := session.GetUserId() reputation := this.module.modelReputation.getDBReputation(uid) if reputation == nil { - code = pb.ErrorCode_DataNotFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DataNotFound, + Title: pb.ErrorCode_DataNotFound.ToString(), + } return } diff --git a/modules/reputation/api_upgrade.go b/modules/reputation/api_upgrade.go index 5d24ab0f5..0dc880300 100644 --- a/modules/reputation/api_upgrade.go +++ b/modules/reputation/api_upgrade.go @@ -17,7 +17,10 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad reputation := this.module.modelReputation.getDBReputation(uid) if reputation == nil { - code = pb.ErrorCode_DataNotFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DataNotFound, + Title: pb.ErrorCode_DataNotFound.ToString(), + } return } @@ -41,9 +44,8 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad talentCfg := this.module.configure.getTalentNodeCfgBy(req.NodeId, nodeLv) if talentCfg == nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), } return } @@ -55,7 +57,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad if camp != nil { if len(camp.Nodes) == 0 { //消耗 - if c := this.module.ConsumeRes(session, talentCfg.IconCos, true); c == pb.ErrorCode_Success { + if c := this.module.ConsumeRes(session, talentCfg.IconCos, true); c == nil { camp.Nodes = append(camp.Nodes, &pb.TalentNode{ Nid: req.NodeId, Lv: 1, @@ -67,15 +69,21 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad for _, v := range camp.Nodes { //判断是否满级 if req.NodeId == v.Nid && v.Status == 2 { - code = pb.ErrorCode_ReputationTalentFull + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReputationTalentFull, + Title: pb.ErrorCode_ReputationTalentFull.ToString(), + } return } else if req.NodeId == v.Nid { if !this.module.modelReputation.isReachPreNode(reputation, req.RaceType, talentCfg.PreNode, talentCfg.PreNodeLv) { - code = pb.ErrorCode_ReputationNoPreNodeLv + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReputationNoPreNodeLv, + Title: pb.ErrorCode_ReputationNoPreNodeLv.ToString(), + } return } //消耗 - if c := this.module.ConsumeRes(session, talentCfg.IconCos, true); c == pb.ErrorCode_Success { + if c := this.module.ConsumeRes(session, talentCfg.IconCos, true); c == nil { v.Lv++ camp.CampAttr = this.module.modelReputation.computeAttr(camp.CampAttr, talentCfg.Attribute)