Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-group
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
hujiebin
hilo-group
Commits
d86db64d
Commit
d86db64d
authored
Apr 13, 2023
by
chenweijian
Committed by
hujiebin
Apr 13, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
房间勋章
parent
4025d2e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
group.sql
mysql/group.sql
+6
-0
group_info.go
route/group_r/group_info.go
+5
-1
No files found.
mysql/group.sql
0 → 100644
View file @
d86db64d
ALTER
TABLE
hilo
.
group_medal
ADD
expire_at
DATETIME
DEFAULT
null
NULL
COMMENT
'过期时间'
;
CREATE
INDEX
expire_at
USING
BTREE
ON
hilo
.
group_medal
(
expire_at
);
ALTER
TABLE
hilo
.
res_medal
ADD
attr_type
TINYINT
UNSIGNED
DEFAULT
1
NOT
NULL
COMMENT
'勋章类型1.个人2.房间'
;
update
res_medal
set
attr_type
=
2
where
name
like
'%房间%'
;
update
res_medal
set
attr_type
=
2
where
id
in
(
select
res_medal_id
from
group_medal
);
\ No newline at end of file
route/group_r/group_info.go
View file @
d86db64d
...
...
@@ -557,6 +557,7 @@ func GetRoomInfo(c *gin.Context) (*mycontext.MyContext, error) {
err
=
mysql
.
Db
.
Model
(
&
res_m
.
ResMedal
{})
.
Joins
(
"INNER JOIN group_medal m ON m.res_medal_id = res_medal.id"
)
.
Where
(
"m.im_group_id = ?"
,
groupId
)
.
Where
(
"(expire_at is null or expire_at > ?)"
,
time
.
Now
()
.
Format
(
utils
.
DATETIME_FORMAT
))
.
Order
(
"m.id desc"
)
.
Find
(
&
resMedals
)
.
Error
if
err
==
nil
{
...
...
@@ -1170,7 +1171,10 @@ func GroupMedalAll(c *gin.Context) (*mycontext.MyContext, error) {
}
resMedals
:=
[]
res_m
.
ResMedal
{}
if
err
:=
mysql
.
Db
.
Model
(
&
res_m
.
ResMedal
{})
.
Joins
(
"inner join group_medal m on m.res_medal_id = res_medal.id"
)
.
Where
(
"m.im_group_id = ?"
,
groupId
)
.
Order
(
"m.id desc"
)
.
Find
(
&
resMedals
)
.
Error
;
err
!=
nil
{
if
err
:=
mysql
.
Db
.
Model
(
&
res_m
.
ResMedal
{})
.
Joins
(
"inner join group_medal m on m.res_medal_id = res_medal.id"
)
.
Where
(
"m.im_group_id = ?"
,
groupId
)
.
Where
(
"(expire_at is null or expire_at > ?)"
,
time
.
Now
()
.
Format
(
utils
.
DATETIME_FORMAT
))
.
Order
(
"m.id desc"
)
.
Find
(
&
resMedals
)
.
Error
;
err
!=
nil
{
return
myContext
,
err
}
...
...
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