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