feat:优化信息
This commit is contained in:
@ -20,7 +20,8 @@ type (
|
||||
InstanceLoginParams struct {
|
||||
UID uint64
|
||||
Avatar, Name, Mobile string
|
||||
Vip bool
|
||||
Vip model.UserInstanceVipKind
|
||||
VipStatus bool
|
||||
VipDeadline time.Time
|
||||
Currency float64
|
||||
Identity, SelectIdentity int
|
||||
@ -43,7 +44,8 @@ func (c *Instance) Login() InstanceLoginCallback {
|
||||
_session.Avatar = params.Avatar
|
||||
_session.Name = params.Name
|
||||
_session.Mobile = params.Mobile
|
||||
_session.Vip = params.Vip
|
||||
_session.Vip = int(params.Vip)
|
||||
_session.VipStatus = params.VipStatus
|
||||
_session.VipDeadline = params.VipDeadline
|
||||
_session.Currency = params.Currency
|
||||
_session.Identity = params.Identity
|
||||
|
@ -100,8 +100,8 @@ RETURNS:
|
||||
return &InstanceLoginParams{
|
||||
UID: mUserInstance.UUID,
|
||||
Avatar: mUserInstance.GetAvatarAttribute(config.SettingInfo.Domain), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
|
||||
Vip: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline, Currency: mUserAssets.Currency,
|
||||
Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
|
||||
Vip: mUserInstance.Vip, VipStatus: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline,
|
||||
Currency: mUserAssets.Currency, Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
|
||||
Status: mUserInstance.Status,
|
||||
}, nil
|
||||
}
|
||||
@ -140,8 +140,8 @@ func loginForPassword(params *LoginParams, local string) (*InstanceLoginParams,
|
||||
return &InstanceLoginParams{
|
||||
UID: mUserInstance.UUID,
|
||||
Avatar: mUserInstance.GetAvatarAttribute(config.SettingInfo.Domain), Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
|
||||
Vip: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline, Currency: mUserAssets.Currency,
|
||||
Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
|
||||
Vip: mUserInstance.Vip, VipStatus: mUserInstance.VipStatus(), VipDeadline: mUserInstance.VipDeadline,
|
||||
Currency: mUserAssets.Currency, Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
|
||||
Status: mUserInstance.Status,
|
||||
}, nil
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ type (
|
||||
Avatar string `json:"avatar"` // 头像
|
||||
Name string `json:"name"` // 名称
|
||||
Currency float64 `json:"currency"` // 创新币
|
||||
Vip bool `json:"vip"` // Vip状态
|
||||
Vip int `json:"vip"` // Vip
|
||||
VipDays int `json:"vip_days"` // Vip剩余天数
|
||||
Identity int `json:"identity"` // 具体身份
|
||||
SelectIdentity int `json:"select_identity"` // 最后一次选中的身份信息
|
||||
@ -38,11 +38,11 @@ type (
|
||||
func (c *Instance) Info() *InstanceInfo {
|
||||
out := &InstanceInfo{Avatar: c.Avatar, Name: c.Name,
|
||||
Currency: c.Currency,
|
||||
Vip: c.VipStatus(),
|
||||
Identity: c.Identity,
|
||||
SelectIdentity: c.SelectIdentity}
|
||||
|
||||
if out.Vip {
|
||||
if c.IsVip() {
|
||||
out.Vip = c.Vip
|
||||
out.VipDays = utils.DiffTimeDays(time.Now(), c.VipDeadline)
|
||||
}
|
||||
return out
|
||||
|
Reference in New Issue
Block a user