diff --git a/myerr/code.go b/myerr/code.go index dd6570768be8cd8b63c2bcd4f428ef05bc6d950e..39dd656266811b83e2974b96d890bdd2bffb3f29 100755 --- a/myerr/code.go +++ b/myerr/code.go @@ -2,6 +2,7 @@ package myerr import ( "fmt" + "git.hilo.cn/hilo-common/myerr" "git.hilo.cn/hilo-common/mylogrus" "github.com/pkg/errors" "strconv" @@ -225,3 +226,11 @@ func WrapErr(err error) error { return errors.Wrap(err, "") } } + +func ToLocal(err *myerr.BusinessError) error { + return &BusinessError{ + code: err.GetCode(), + message: err.GetMsg(), + err: err.GetErr(), + } +} diff --git a/route/cp_r/cp_relation.go b/route/cp_r/cp_relation.go index 4807f3fc384cc958837429ef9d223e1ae1176f24..80253cca37e4b13ecd239ea56d87ae64165f8bda 100644 --- a/route/cp_r/cp_relation.go +++ b/route/cp_r/cp_relation.go @@ -156,7 +156,7 @@ func ReplyCpInvite(c *gin.Context) (*mycontext.MyContext, error) { return myCtx, err } if cpRecord == nil || cpRecord.Id == 0 { - return myCtx, msg.GetErrByLanguage(model, common.MSG_ID_ALREADY_EXPIRED, lang, comerr.AlreadyExpired) + return myCtx, myerr.ToLocal(msg.GetErrByLanguage(model, common.MSG_ID_ALREADY_EXPIRED, lang, comerr.AlreadyExpired)) } if optType == 1 { // 接受的时候 @@ -316,7 +316,7 @@ func ReplyCpCancel(c *gin.Context) (*mycontext.MyContext, error) { return myCtx, err } if cpCancel == nil || cpCancel.Id == 0 { - return myCtx, msg.GetErrByLanguage(model, common.MSG_ID_ALREADY_EXPIRED, lang, comerr.AlreadyExpired) + return myCtx, myerr.ToLocal(msg.GetErrByLanguage(model, common.MSG_ID_ALREADY_EXPIRED, lang, comerr.AlreadyExpired)) } if optType == 1 { // 撤销,只有自己能撤销自己的申请