Commit 9bc0a948 authored by chenweijian's avatar chenweijian

家族

parent fc7d91ea
...@@ -690,14 +690,14 @@ type FamilyMemberDetail struct { ...@@ -690,14 +690,14 @@ type FamilyMemberDetail struct {
type FamilyApplyList struct { type FamilyApplyList struct {
User *user_m.UserTiny `json:"user"` User *user_m.UserTiny `json:"user"`
Time string `json:"time"` Time int64 `json:"time"`
Status int8 `json:"status"` // 0未操作,1已接受,2.已拒绝 Status int8 `json:"status"` // 0未操作,1已接受,2.已拒绝
MgrName string `json:"mgrName"` // 管理员名称 MgrName string `json:"mgrName"` // 管理员名称
} }
type FamilyQuitList struct { type FamilyQuitList struct {
User *user_m.UserTiny `json:"user"` User *user_m.UserTiny `json:"user"`
Time string `json:"time"` Time int64 `json:"time"`
QuitType int8 `json:"status"` // 1.主动退出 2.被踢出 QuitType int8 `json:"status"` // 1.主动退出 2.被踢出
MgrName string `json:"mgrName"` // 管理员名称 MgrName string `json:"mgrName"` // 管理员名称
} }
...@@ -14,7 +14,6 @@ import ( ...@@ -14,7 +14,6 @@ import (
"hilo-group/_const/enum/msg_e" "hilo-group/_const/enum/msg_e"
"hilo-group/_const/redis_key" "hilo-group/_const/redis_key"
"hilo-group/common" "hilo-group/common"
"hilo-group/common/utime"
"hilo-group/cv/group_cv" "hilo-group/cv/group_cv"
"hilo-group/cv/group_power_cv" "hilo-group/cv/group_power_cv"
"hilo-group/cv/medal_cv" "hilo-group/cv/medal_cv"
...@@ -1095,7 +1094,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1095,7 +1094,7 @@ func GroupPowerApplyList(c *gin.Context) (*mycontext.MyContext, error) {
result := make([]*group_power_cv.FamilyApplyList, 0, len(rows)) result := make([]*group_power_cv.FamilyApplyList, 0, len(rows))
for _, v := range rows { for _, v := range rows {
info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute), Status: v.IsAccept} info := &group_power_cv.FamilyApplyList{User: userMap[v.UserId], Time: v.CreatedTime.UnixMilli(), Status: v.IsAccept}
if v.MgrId > 0 { if v.MgrId > 0 {
info.MgrName = userMap[v.MgrId].Nick info.MgrName = userMap[v.MgrId].Nick
} }
...@@ -1245,7 +1244,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1245,7 +1244,7 @@ func GroupPowerQuitList(c *gin.Context) (*mycontext.MyContext, error) {
result := make([]*group_power_cv.FamilyQuitList, 0, len(rows)) result := make([]*group_power_cv.FamilyQuitList, 0, len(rows))
for _, v := range rows { for _, v := range rows {
item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime.Format(utime.LayoutMinute)} item := &group_power_cv.FamilyQuitList{User: userMap[v.UserId], Time: v.CreatedTime.UnixMilli()}
if v.UserId == v.MgrId { if v.UserId == v.MgrId {
item.QuitType = 1 // 主动退出 item.QuitType = 1 // 主动退出
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment