Commit 724940f8 authored by chenweijian's avatar chenweijian

是否新用户

parent e2d2a8ee
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"git.hilo.cn/hilo-common/mylogrus" "git.hilo.cn/hilo-common/mylogrus"
"git.hilo.cn/hilo-common/resource/mysql" "git.hilo.cn/hilo-common/resource/mysql"
"git.hilo.cn/hilo-common/rpc" "git.hilo.cn/hilo-common/rpc"
"git.hilo.cn/hilo-common/utils"
"gorm.io/gorm" "gorm.io/gorm"
"hilo-user/_const/enum/country_e" "hilo-user/_const/enum/country_e"
"hilo-user/_const/enum/cp_e" "hilo-user/_const/enum/cp_e"
...@@ -98,8 +97,6 @@ type CvUserBase struct { ...@@ -98,8 +97,6 @@ type CvUserBase struct {
IsVip bool `json:"isVip"` IsVip bool `json:"isVip"`
//是否是官方人员 //是否是官方人员
IsOfficialStaff bool `json:"isOfficialStaff"` IsOfficialStaff bool `json:"isOfficialStaff"`
//是否新用户(注册7天内)
IsNew bool `json:"isNew"`
//VIP用户过期时间(只有自己查询自己,才返回) //VIP用户过期时间(只有自己查询自己,才返回)
VipExpireTime *int64 `json:"vipExpireTime"` VipExpireTime *int64 `json:"vipExpireTime"`
Svip rpc.CvSvip `json:"svip"` // svip结构,等级+权限 Svip rpc.CvSvip `json:"svip"` // svip结构,等级+权限
...@@ -218,7 +215,6 @@ func GetUserBases(userIds []mysql.ID, myUserId mysql.ID) ([]*CvUserBase, error) ...@@ -218,7 +215,6 @@ func GetUserBases(userIds []mysql.ID, myUserId mysql.ID) ([]*CvUserBase, error)
Level: nobles[user.ID].Level, Level: nobles[user.ID].Level,
EndTime: nobles[user.ID].EndTime.Unix(), EndTime: nobles[user.ID].EndTime.Unix(),
}, },
IsNew: utils.IsNewUser(user.Birthday),
} }
if cvUserBase.Noble.Level <= 0 { if cvUserBase.Noble.Level <= 0 {
cvUserBase.Noble.EndTime = 0 cvUserBase.Noble.EndTime = 0
...@@ -308,7 +304,6 @@ func GetUserBasesForCp(userIds []mysql.ID) ([]*CvUserBase, error) { ...@@ -308,7 +304,6 @@ func GetUserBasesForCp(userIds []mysql.ID) ([]*CvUserBase, error) {
Level: nobles[user.ID].Level, Level: nobles[user.ID].Level,
EndTime: nobles[user.ID].EndTime.Unix(), EndTime: nobles[user.ID].EndTime.Unix(),
}, },
IsNew: utils.IsNewUser(user.Birthday),
} }
if cvUserBase.Noble.Level <= 0 { if cvUserBase.Noble.Level <= 0 {
cvUserBase.Noble.EndTime = 0 cvUserBase.Noble.EndTime = 0
......
...@@ -5,7 +5,6 @@ import ( ...@@ -5,7 +5,6 @@ import (
"git.hilo.cn/hilo-common/mycontext" "git.hilo.cn/hilo-common/mycontext"
"git.hilo.cn/hilo-common/resource/mysql" "git.hilo.cn/hilo-common/resource/mysql"
"git.hilo.cn/hilo-common/rpc" "git.hilo.cn/hilo-common/rpc"
"git.hilo.cn/hilo-common/utils"
"gorm.io/gorm" "gorm.io/gorm"
"hilo-user/_const/enum/user_e" "hilo-user/_const/enum/user_e"
"hilo-user/cv/headwear_cv" "hilo-user/cv/headwear_cv"
...@@ -294,7 +293,6 @@ func userToDetailOne(model *domain.Model, user *user_m.User, myUserId mysql.ID, ...@@ -294,7 +293,6 @@ func userToDetailOne(model *domain.Model, user *user_m.User, myUserId mysql.ID,
MedalInfo: IfLogoutMedalInfo(IfLogout(user.LogoutTime), []medal_cv.CvMedal{}, medalInfo), MedalInfo: IfLogoutMedalInfo(IfLogout(user.LogoutTime), []medal_cv.CvMedal{}, medalInfo),
Headwear: IfLogoutHeadwear(IfLogout(user.LogoutTime), nil, headwear), Headwear: IfLogoutHeadwear(IfLogout(user.LogoutTime), nil, headwear),
Ride: IfLogoutRide(IfLogout(user.LogoutTime), property_cv.CvProperty{}, ride), Ride: IfLogoutRide(IfLogout(user.LogoutTime), property_cv.CvProperty{}, ride),
IsNew: utils.IsNewUser(user.Birthday),
}, },
IsPush: TypeToUint8(&user.IsPush), IsPush: TypeToUint8(&user.IsPush),
IsLike: &isLike, IsLike: &isLike,
......
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