diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index 6e1e71e2a..62775a112 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -44,9 +44,13 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) // 弹劾 if err := this.module.modelSociaty.accuse(sociaty); err != nil { var customErr = new(comm.CustomError) - var code pb.ErrorCode if errors.As(err, &customErr) { - code = customErr.Code + code := customErr.Code + errdata = &pb.ErrorData{ + Code: code, + Title: code.ToString(), + Datastring: sociaty.Id, + } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -55,11 +59,6 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) } } - errdata = &pb.ErrorData{ - Code: code, - Title: code.ToString(), - Datastring: sociaty.Id, - } this.module.Error("弹劾", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 0acb1234a..d8d7c6374 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -48,10 +48,14 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( } if err := this.module.modelSociaty.agree(req.Uid, sociaty); err != nil { - var customError = new(comm.CustomError) - var code pb.ErrorCode + var customError = new(comm.CustomError) if errors.As(err, &customError) { - code = customError.Code + code := customError.Code + errdata = &pb.ErrorData{ + Code: code, + Title: code.ToString(), + Message: err.Error(), + } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -59,11 +63,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( Message: err.Error(), } } - errdata = &pb.ErrorData{ - Code: code, - Title: code.ToString(), - Message: err.Error(), - } + this.module.Error("公会审核-同意", log.Field{Key: "uid", Value: uid}, log.Field{Key: "申请人", Value: req.Uid}, diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index b7965e656..ff4608e2c 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -112,9 +112,13 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( isCheck, err := this.module.modelSociaty.apply(uid, sociaty) if err != nil { var customError = new(comm.CustomError) - var code pb.ErrorCode if errors.As(err, &customError) { - code = customError.Code + code := customError.Code + errdata = &pb.ErrorData{ + Code: code, + Title: code.ToString(), + Message: err.Error(), + } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -122,11 +126,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( Message: err.Error(), } } - errdata = &pb.ErrorData{ - Code: code, - Title: code.ToString(), - Message: err.Error(), - } + this.module.Error("公会申请", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: req.SociatyId}, diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index 96bca91d1..f292b37de 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -81,9 +81,14 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) if err := this.module.modelSociatyLog.addLog(Log_Job, sociaty.Id, uid, req.TargetId, pb.SociatyJob_PRESIDENT.String()); err != nil { var customErr = new(comm.CustomError) - var code pb.ErrorCode + if errors.As(err, &customErr) { - code = customErr.Code + code := customErr.Code + errdata = &pb.ErrorData{ + Code: code, + Title: code.ToString(), + Message: err.Error(), + } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -91,11 +96,7 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) Message: err.Error(), } } - errdata = &pb.ErrorData{ - Code: code, - Title: code.ToString(), - Message: err.Error(), - } + this.module.Error("公会转让日志", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index 3cb183cd0..b77a00e80 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -81,13 +81,14 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) Title: code.ToString(), Message: err.Error(), } - return - } - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } + return } diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 6b82eebdb..22e4f483b 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -50,9 +50,13 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar // 踢人 if err := this.module.modelSociaty.discharge(req.TargetId, sociaty); err != nil { var customError = new(comm.CustomError) - var code pb.ErrorCode + if errors.As(err, &customError) { - code = customError.Code + code := customError.Code + errdata = &pb.ErrorData{ + Code: code, + Title: code.ToString(), + } } else { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -60,10 +64,7 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar Message: err.Error(), } } - errdata = &pb.ErrorData{ - Code: code, - Title: code.ToString(), - } + this.module.Error("踢出公会", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index e6c5bd027..197461d85 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -32,7 +32,6 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er errdata = &pb.ErrorData{ Code: pb.ErrorCode_SociatyNoAdded, Title: pb.ErrorCode_SociatyNoAdded.ToString(), - Message: err.Error(), } return }