1
This commit is contained in:
@@ -116,7 +116,7 @@ func GetUsers(db *DaoDB, userType int, keyword, popUser string, userIDs, userID2
|
|||||||
|
|
||||||
func GetUsers2(db *DaoDB, keyword string, userID string, pop int, mobile string, fromTime, toTime time.Time, timeType int, cityCodes, consumeTypes []int, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
|
func GetUsers2(db *DaoDB, keyword string, userID string, pop int, mobile string, fromTime, toTime time.Time, timeType int, cityCodes, consumeTypes []int, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
|
||||||
var (
|
var (
|
||||||
userList []*model.User
|
userList []*model.UserBalance
|
||||||
)
|
)
|
||||||
offset = jxutils.FormalizePageOffset(offset)
|
offset = jxutils.FormalizePageOffset(offset)
|
||||||
pageSize = jxutils.FormalizePageSize(pageSize)
|
pageSize = jxutils.FormalizePageSize(pageSize)
|
||||||
|
|||||||
@@ -54,15 +54,19 @@ type User struct {
|
|||||||
IDCardNo string `orm:"size(18);column(id_card_no)" json:"idCardNo" compact:"idCardNo"` // 身份证号
|
IDCardNo string `orm:"size(18);column(id_card_no)" json:"idCardNo" compact:"idCardNo"` // 身份证号
|
||||||
Remark string `orm:"size(255)" json:"remark"`
|
Remark string `orm:"size(255)" json:"remark"`
|
||||||
|
|
||||||
LastLoginAt *time.Time `orm:"null" json:"lastLoginAt"`
|
LastLoginAt *time.Time `orm:"null" json:"lastLoginAt"`
|
||||||
LastLoginIP string `orm:"size(64);column(last_login_ip)" json:"lastLoginIP"`
|
LastLoginIP string `orm:"size(64);column(last_login_ip)" json:"lastLoginIP"`
|
||||||
LastLoginType string `orm:"size(16)" json:"lastLoginType"`
|
LastLoginType string `orm:"size(16)" json:"lastLoginType"`
|
||||||
PopCode string `json:"popCode"` //推广码
|
PopCode string `json:"popCode"` //推广码
|
||||||
PopUser string `json:"popUser"` //推广人
|
PopUser string `json:"popUser"` //推广人
|
||||||
PopCount int `json:"popCount"` //推荐人数
|
PopCount int `json:"popCount"` //推荐人数
|
||||||
PopFlag int `json:"popFlag"` //是否已通过推荐获得免费会员
|
PopFlag int `json:"popFlag"` //是否已通过推荐获得免费会员
|
||||||
PopedFlag int `json:"popedFlag"` //被邀请标志(弹框)
|
PopedFlag int `json:"popedFlag"` //被邀请标志(弹框)
|
||||||
AccountBalance int64 `json:"-"` // 银行余额
|
}
|
||||||
|
|
||||||
|
type UserBalance struct {
|
||||||
|
User
|
||||||
|
AccountBalance int64 `json:"account_balance"` // 银行余额
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*User) TableUnique() [][]string {
|
func (*User) TableUnique() [][]string {
|
||||||
|
|||||||
Reference in New Issue
Block a user