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
831fb5a9
Commit
831fb5a9
authored
Jun 07, 2023
by
hujiebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "db加一个type"
This reverts commit
62781316
.
parent
62781316
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
3 deletions
+27
-3
anniversary.go
domain/model/cp_m/anniversary.go
+0
-2
anniversary.go
route/cp_r/anniversary.go
+27
-1
No files found.
domain/model/cp_m/anniversary.go
View file @
831fb5a9
...
...
@@ -3,7 +3,6 @@ package cp_m
import
(
"git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/resource/mysql"
"hilo-user/_const/enum/cp_e"
"time"
)
...
...
@@ -11,7 +10,6 @@ import (
type
CpAnniversary
struct
{
mysql
.
Entity
CpId
mysql
.
ID
Type
cp_e
.
AnniversaryItemType
UserId1
mysql
.
ID
UserId2
mysql
.
ID
Content
string
...
...
route/cp_r/anniversary.go
View file @
831fb5a9
...
...
@@ -4,8 +4,11 @@ import (
"git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/mycontext"
"github.com/gin-gonic/gin"
"hilo-user/_const/enum/cp_e"
"hilo-user/cv/cp_cv"
"hilo-user/cv/user_cv"
"hilo-user/domain/model/cp_m"
"hilo-user/domain/model/user_m"
"hilo-user/myerr/bizerr"
"hilo-user/req"
"hilo-user/resp"
...
...
@@ -91,10 +94,33 @@ func PageAnniversary(c *gin.Context) (*mycontext.MyContext, error) {
}
var
response
=
make
([]
cp_cv
.
CvCpAnniversary
,
0
)
model
:=
domain
.
CreateModelContext
(
myCtx
)
cpRelation
,
exits
:=
cp_m
.
GetCpRelation
(
model
,
userId
)
if
exits
{
userIds
:=
[]
uint64
{
cpRelation
.
UserId1
,
cpRelation
.
UserId2
}
users
,
err
:=
user_m
.
GetUserMapByIds
(
model
,
userIds
)
if
err
!=
nil
{
return
myCtx
,
err
}
cpUserId
:=
cpRelation
.
UserId2
if
cpUserId
==
userId
{
cpUserId
=
cpRelation
.
UserId1
}
userInfo
:=
user_cv
.
UserToTiny
(
users
[
userId
])
cpUserInfo
:=
user_cv
.
UserToTiny
(
users
[
cpUserId
])
response
=
append
(
response
,
cp_cv
.
CvCpAnniversary
{
Type
:
cp_e
.
AnniversaryItemTypeAvatar
,
CpInfo
:
&
cp_cv
.
CvCpBase
{
UserInfo
:
*
userInfo
,
CpUserInfo
:
*
cpUserInfo
,
},
Timestamp
:
cpRelation
.
CreatedTime
.
Unix
(),
CanDel
:
false
,
})
}
anniversary
:=
cp_m
.
GetAllCpAnniversary
(
model
,
userId
)
for
_
,
v
:=
range
anniversary
{
response
=
append
(
response
,
cp_cv
.
CvCpAnniversary
{
Type
:
v
.
Type
,
Type
:
cp_e
.
AnniversaryItemTypeNormal
,
Id
:
v
.
ID
,
Content
:
v
.
Content
,
Timestamp
:
v
.
Timestamp
,
...
...
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