From ca6aa24fe9e77c11545ae1dde855b9385c389406 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 30 May 2023 17:45:57 +0800 Subject: [PATCH] errorData --- modules/sociaty/api_cross_accuse.go | 1 + modules/sociaty/api_cross_activitylist.go | 1 + modules/sociaty/api_cross_activityreceive.go | 1 + modules/sociaty/api_cross_agree.go | 1 + modules/worldtask/api_accept.go | 1 + modules/worldtask/api_battlefinish.go | 3 +-- modules/worldtask/api_battlestart.go | 2 +- modules/worldtask/api_chapterreward.go | 2 +- modules/worldtask/api_completetask.go | 1 + modules/worldtask/api_finish.go | 2 +- modules/worldtask/api_mine.go | 2 +- 11 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index a614be09b..7cd5b8f03 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -17,6 +17,7 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) if code = this.AccuseCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_activitylist.go b/modules/sociaty/api_cross_activitylist.go index 0c34705da..bc2b5f9c2 100644 --- a/modules/sociaty/api_cross_activitylist.go +++ b/modules/sociaty/api_cross_activitylist.go @@ -12,6 +12,7 @@ func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.Sociat } func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data *pb.ErrorData) { + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index a7f7f32c3..a69be248e 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -20,6 +20,7 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA if code = this.ActivityreceiveCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 0c227ee36..71583e5ea 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -21,6 +21,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index e25d49e04..16235d0a6 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -20,6 +20,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() user := a.module.ModuleUser.GetUser(uid) if user == nil { diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index a44d5fa3f..81e85f3d3 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -22,11 +22,10 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt } func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { - if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() taskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || taskConf == nil { diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index ca25ccd53..248b04b8f 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -23,7 +23,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} resp := &pb.WorldtaskBattleStartResp{} battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId) diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go index f95c45e02..e6d8563e8 100644 --- a/modules/worldtask/api_chapterreward.go +++ b/modules/worldtask/api_chapterreward.go @@ -16,7 +16,7 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() rsp := &pb.WorldtaskChapterrewardResp{} myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 972c13e6f..500370c47 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -17,6 +17,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} rsp := &pb.WorldtaskCompleteCondiResp{} uid := session.GetUserId() diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 243c649ec..7dfd74843 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -23,7 +23,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if code = this.FinishCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() rsp := &pb.WorldtaskFinishResp{} diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go index f306fedc0..cf4aa41c6 100644 --- a/modules/worldtask/api_mine.go +++ b/modules/worldtask/api_mine.go @@ -18,7 +18,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineR func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() - + data = &pb.ErrorData{} user := this.module.ModuleUser.GetUser(uid) if user == nil { code = pb.ErrorCode_UserNofound