Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-user
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweijian
hilo-user
Commits
9a2dbaa0
Commit
9a2dbaa0
authored
Jun 13, 2023
by
chenweijian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
err
parent
a7a91049
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
code.go
myerr/code.go
+9
-0
cp_relation.go
route/cp_r/cp_relation.go
+2
-2
No files found.
myerr/code.go
View file @
9a2dbaa0
...
@@ -2,6 +2,7 @@ package myerr
...
@@ -2,6 +2,7 @@ package myerr
import
(
import
(
"fmt"
"fmt"
"git.hilo.cn/hilo-common/myerr"
"git.hilo.cn/hilo-common/mylogrus"
"git.hilo.cn/hilo-common/mylogrus"
"github.com/pkg/errors"
"github.com/pkg/errors"
"strconv"
"strconv"
...
@@ -225,3 +226,11 @@ func WrapErr(err error) error {
...
@@ -225,3 +226,11 @@ func WrapErr(err error) error {
return
errors
.
Wrap
(
err
,
""
)
return
errors
.
Wrap
(
err
,
""
)
}
}
}
}
func
ToLocal
(
err
*
myerr
.
BusinessError
)
error
{
return
&
BusinessError
{
code
:
err
.
GetCode
(),
message
:
err
.
GetMsg
(),
err
:
err
.
GetErr
(),
}
}
route/cp_r/cp_relation.go
View file @
9a2dbaa0
...
@@ -156,7 +156,7 @@ func ReplyCpInvite(c *gin.Context) (*mycontext.MyContext, error) {
...
@@ -156,7 +156,7 @@ func ReplyCpInvite(c *gin.Context) (*mycontext.MyContext, error) {
return
myCtx
,
err
return
myCtx
,
err
}
}
if
cpRecord
==
nil
||
cpRecord
.
Id
==
0
{
if
cpRecord
==
nil
||
cpRecord
.
Id
==
0
{
return
myCtx
,
m
sg
.
GetErrByLanguage
(
model
,
common
.
MSG_ID_ALREADY_EXPIRED
,
lang
,
comerr
.
AlreadyExpired
)
return
myCtx
,
m
yerr
.
ToLocal
(
msg
.
GetErrByLanguage
(
model
,
common
.
MSG_ID_ALREADY_EXPIRED
,
lang
,
comerr
.
AlreadyExpired
)
)
}
}
if
optType
==
1
{
// 接受的时候
if
optType
==
1
{
// 接受的时候
...
@@ -316,7 +316,7 @@ func ReplyCpCancel(c *gin.Context) (*mycontext.MyContext, error) {
...
@@ -316,7 +316,7 @@ func ReplyCpCancel(c *gin.Context) (*mycontext.MyContext, error) {
return
myCtx
,
err
return
myCtx
,
err
}
}
if
cpCancel
==
nil
||
cpCancel
.
Id
==
0
{
if
cpCancel
==
nil
||
cpCancel
.
Id
==
0
{
return
myCtx
,
m
sg
.
GetErrByLanguage
(
model
,
common
.
MSG_ID_ALREADY_EXPIRED
,
lang
,
comerr
.
AlreadyExpired
)
return
myCtx
,
m
yerr
.
ToLocal
(
msg
.
GetErrByLanguage
(
model
,
common
.
MSG_ID_ALREADY_EXPIRED
,
lang
,
comerr
.
AlreadyExpired
)
)
}
}
if
optType
==
1
{
// 撤销,只有自己能撤销自己的申请
if
optType
==
1
{
// 撤销,只有自己能撤销自己的申请
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment