diff --git a/model/autogenerated_user.go b/model/autogenerated_user.go index ef0466e..e6b46d9 100644 --- a/model/autogenerated_user.go +++ b/model/autogenerated_user.go @@ -5207,6 +5207,42 @@ func (qs UserQuerySet) One(ret *User) error { return qs.db.First(ret).Error } +// OpenMemberTimeEq is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeEq(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time = ?", openMemberTime)) +} + +// OpenMemberTimeGt is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeGt(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time > ?", openMemberTime)) +} + +// OpenMemberTimeGte is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeGte(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time >= ?", openMemberTime)) +} + +// OpenMemberTimeLt is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeLt(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time < ?", openMemberTime)) +} + +// OpenMemberTimeLte is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeLte(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time <= ?", openMemberTime)) +} + +// OpenMemberTimeNe is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OpenMemberTimeNe(openMemberTime time.Time) UserQuerySet { + return qs.w(qs.db.Where("open_member_time != ?", openMemberTime)) +} + // OrderAscByAppOpenID is an autogenerated method // nolint: dupl func (qs UserQuerySet) OrderAscByAppOpenID() UserQuerySet { @@ -5297,6 +5333,12 @@ func (qs UserQuerySet) OrderAscByMemberLevel() UserQuerySet { return qs.w(qs.db.Order("member_level ASC")) } +// OrderAscByOpenMemberTime is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OrderAscByOpenMemberTime() UserQuerySet { + return qs.w(qs.db.Order("open_member_time ASC")) +} + // OrderAscByProvince is an autogenerated method // nolint: dupl func (qs UserQuerySet) OrderAscByProvince() UserQuerySet { @@ -5459,6 +5501,12 @@ func (qs UserQuerySet) OrderDescByMemberLevel() UserQuerySet { return qs.w(qs.db.Order("member_level DESC")) } +// OrderDescByOpenMemberTime is an autogenerated method +// nolint: dupl +func (qs UserQuerySet) OrderDescByOpenMemberTime() UserQuerySet { + return qs.w(qs.db.Order("open_member_time DESC")) +} + // OrderDescByProvince is an autogenerated method // nolint: dupl func (qs UserQuerySet) OrderDescByProvince() UserQuerySet { @@ -6360,6 +6408,13 @@ func (u UserUpdater) SetMemberLevel(memberLevel uint32) UserUpdater { return u } +// SetOpenMemberTime is an autogenerated method +// nolint: dupl +func (u UserUpdater) SetOpenMemberTime(openMemberTime time.Time) UserUpdater { + u.fields[string(UserDBSchema.OpenMemberTime)] = openMemberTime + return u +} + // SetProvince is an autogenerated method // nolint: dupl func (u UserUpdater) SetProvince(province string) UserUpdater { @@ -6472,95 +6527,98 @@ func (f UserDBSchemaField) String() string { // UserDBSchema stores db field names of User var UserDBSchema = struct { - ID UserDBSchemaField - CreatedAt UserDBSchemaField - UpdatedAt UserDBSchemaField - DeletedAt UserDBSchemaField - Uid UserDBSchemaField - MemberLevel UserDBSchemaField - MemberExpire UserDBSchemaField - Bond UserDBSchemaField - WxName UserDBSchemaField - WxAvatar UserDBSchemaField - WxOpenID UserDBSchemaField - AppOpenID UserDBSchemaField - WxUnionID UserDBSchemaField - Tel UserDBSchemaField - Gender UserDBSchemaField - City UserDBSchemaField - Province UserDBSchemaField - Country UserDBSchemaField - Deposit UserDBSchemaField - UserType UserDBSchemaField - StoreId UserDBSchemaField - InviteCodeUrl UserDBSchemaField - LastLoginAt UserDBSchemaField - IP UserDBSchemaField - InBlack UserDBSchemaField - StoreType UserDBSchemaField - Version UserDBSchemaField + ID UserDBSchemaField + CreatedAt UserDBSchemaField + UpdatedAt UserDBSchemaField + DeletedAt UserDBSchemaField + Uid UserDBSchemaField + MemberLevel UserDBSchemaField + MemberExpire UserDBSchemaField + OpenMemberTime UserDBSchemaField + Bond UserDBSchemaField + WxName UserDBSchemaField + WxAvatar UserDBSchemaField + WxOpenID UserDBSchemaField + AppOpenID UserDBSchemaField + WxUnionID UserDBSchemaField + Tel UserDBSchemaField + Gender UserDBSchemaField + City UserDBSchemaField + Province UserDBSchemaField + Country UserDBSchemaField + Deposit UserDBSchemaField + UserType UserDBSchemaField + StoreId UserDBSchemaField + InviteCodeUrl UserDBSchemaField + LastLoginAt UserDBSchemaField + IP UserDBSchemaField + InBlack UserDBSchemaField + StoreType UserDBSchemaField + Version UserDBSchemaField }{ - ID: UserDBSchemaField("id"), - CreatedAt: UserDBSchemaField("created_at"), - UpdatedAt: UserDBSchemaField("updated_at"), - DeletedAt: UserDBSchemaField("deleted_at"), - Uid: UserDBSchemaField("uid"), - MemberLevel: UserDBSchemaField("member_level"), - MemberExpire: UserDBSchemaField("member_expire"), - Bond: UserDBSchemaField("bond"), - WxName: UserDBSchemaField("wx_name"), - WxAvatar: UserDBSchemaField("wx_avatar"), - WxOpenID: UserDBSchemaField("wx_open_id"), - AppOpenID: UserDBSchemaField("app_open_id"), - WxUnionID: UserDBSchemaField("wx_union_id"), - Tel: UserDBSchemaField("tel"), - Gender: UserDBSchemaField("gender"), - City: UserDBSchemaField("city"), - Province: UserDBSchemaField("province"), - Country: UserDBSchemaField("country"), - Deposit: UserDBSchemaField("deposit"), - UserType: UserDBSchemaField("user_type"), - StoreId: UserDBSchemaField("store_id"), - InviteCodeUrl: UserDBSchemaField("invite_code_url"), - LastLoginAt: UserDBSchemaField("last_login_at"), - IP: UserDBSchemaField("ip"), - InBlack: UserDBSchemaField("in_black"), - StoreType: UserDBSchemaField("store_type"), - Version: UserDBSchemaField("version"), + ID: UserDBSchemaField("id"), + CreatedAt: UserDBSchemaField("created_at"), + UpdatedAt: UserDBSchemaField("updated_at"), + DeletedAt: UserDBSchemaField("deleted_at"), + Uid: UserDBSchemaField("uid"), + MemberLevel: UserDBSchemaField("member_level"), + MemberExpire: UserDBSchemaField("member_expire"), + OpenMemberTime: UserDBSchemaField("open_member_time"), + Bond: UserDBSchemaField("bond"), + WxName: UserDBSchemaField("wx_name"), + WxAvatar: UserDBSchemaField("wx_avatar"), + WxOpenID: UserDBSchemaField("wx_open_id"), + AppOpenID: UserDBSchemaField("app_open_id"), + WxUnionID: UserDBSchemaField("wx_union_id"), + Tel: UserDBSchemaField("tel"), + Gender: UserDBSchemaField("gender"), + City: UserDBSchemaField("city"), + Province: UserDBSchemaField("province"), + Country: UserDBSchemaField("country"), + Deposit: UserDBSchemaField("deposit"), + UserType: UserDBSchemaField("user_type"), + StoreId: UserDBSchemaField("store_id"), + InviteCodeUrl: UserDBSchemaField("invite_code_url"), + LastLoginAt: UserDBSchemaField("last_login_at"), + IP: UserDBSchemaField("ip"), + InBlack: UserDBSchemaField("in_black"), + StoreType: UserDBSchemaField("store_type"), + Version: UserDBSchemaField("version"), } // Update updates User fields by primary key // nolint: dupl func (o *User) Update(db *gorm.DB, fields ...UserDBSchemaField) error { dbNameToFieldName := map[string]interface{}{ - "id": o.ID, - "created_at": o.CreatedAt, - "updated_at": o.UpdatedAt, - "deleted_at": o.DeletedAt, - "uid": o.Uid, - "member_level": o.MemberLevel, - "member_expire": o.MemberExpire, - "bond": o.Bond, - "wx_name": o.WxName, - "wx_avatar": o.WxAvatar, - "wx_open_id": o.WxOpenID, - "app_open_id": o.AppOpenID, - "wx_union_id": o.WxUnionID, - "tel": o.Tel, - "gender": o.Gender, - "city": o.City, - "province": o.Province, - "country": o.Country, - "deposit": o.Deposit, - "user_type": o.UserType, - "store_id": o.StoreId, - "invite_code_url": o.InviteCodeUrl, - "last_login_at": o.LastLoginAt, - "ip": o.IP, - "in_black": o.InBlack, - "store_type": o.StoreType, - "version": o.Version, + "id": o.ID, + "created_at": o.CreatedAt, + "updated_at": o.UpdatedAt, + "deleted_at": o.DeletedAt, + "uid": o.Uid, + "member_level": o.MemberLevel, + "member_expire": o.MemberExpire, + "open_member_time": o.OpenMemberTime, + "bond": o.Bond, + "wx_name": o.WxName, + "wx_avatar": o.WxAvatar, + "wx_open_id": o.WxOpenID, + "app_open_id": o.AppOpenID, + "wx_union_id": o.WxUnionID, + "tel": o.Tel, + "gender": o.Gender, + "city": o.City, + "province": o.Province, + "country": o.Country, + "deposit": o.Deposit, + "user_type": o.UserType, + "store_id": o.StoreId, + "invite_code_url": o.InviteCodeUrl, + "last_login_at": o.LastLoginAt, + "ip": o.IP, + "in_black": o.InBlack, + "store_type": o.StoreType, + "version": o.Version, } u := map[string]interface{}{} for _, f := range fields { diff --git a/model/user.go b/model/user.go index 2c39d0a..5e6a0c7 100644 --- a/model/user.go +++ b/model/user.go @@ -15,30 +15,30 @@ import ( type User struct { Model - Uid uint32 `json:"uid" gorm:"column:uid;unique_index"` - MemberLevel uint32 `json:"member_level"` // 会员等级 1-用户 2-会员 - MemberExpire time.Time `json:"member_expire"` // 会员到期时间 - Bond uint32 `json:"bond"` // 保证金 - WxName string `json:"wx_name"` // 昵称 - WxAvatar string `json:"wx_avatar"` // 头像 - WxOpenID string `json:"wx_open_id"` - AppOpenID string `json:"app_open_id"` - WxUnionID string `json:"wx_union_id"` - Tel string `json:"tel"` // 电话 - Gender uint8 `json:"gender"` // 性别 - City string `json:"city"` // 城市 - Province string `json:"province"` // 省 - Country string `json:"country"` // 市 - Deposit uint32 `json:"deposit"` // - UserType uint8 `json:"user_type"` // 用户类型 1-普通用户 2-店员 - StoreId uint64 `json:"store_id"` // 门店id - InviteCodeUrl string `json:"invite_code_url"` // 分享二维码 - LastLoginAt time.Time `json:"last_login_at"` // 最近登录时间 - IP string `json:"-" gorm:"type:varchar(60)"` // ip - InBlack bool `json:"in_black"` // 是否在黑名单 - StoreType uint8 `json:"store_type"` // 1-订单门店 - Version uint32 `json:"-"` - + Uid uint32 `json:"uid" gorm:"column:uid;unique_index"` + MemberLevel uint32 `json:"member_level"` // 会员等级 1-用户 2-会员 + MemberExpire time.Time `json:"member_expire"` // 会员到期时间 + OpenMemberTime time.Time `json:"open_member_time"` // 开通会员 + Bond uint32 `json:"bond"` // 保证金 + WxName string `json:"wx_name"` // 昵称 + WxAvatar string `json:"wx_avatar"` // 头像 + WxOpenID string `json:"wx_open_id"` + AppOpenID string `json:"app_open_id"` + WxUnionID string `json:"wx_union_id"` + Tel string `json:"tel"` // 电话 + Gender uint8 `json:"gender"` // 性别 + City string `json:"city"` // 城市 + Province string `json:"province"` // 省 + Country string `json:"country"` // 市 + Deposit uint32 `json:"deposit"` // + UserType uint8 `json:"user_type"` // 用户类型 1-普通用户 2-店员 + StoreId uint64 `json:"store_id"` // 门店id + InviteCodeUrl string `json:"invite_code_url"` // 分享二维码 + LastLoginAt time.Time `json:"last_login_at"` // 最近登录时间 + IP string `json:"-" gorm:"type:varchar(60)"` // ip + InBlack bool `json:"in_black"` // 是否在黑名单 + StoreType uint8 `json:"store_type"` // 1-订单门店 + Version uint32 `json:"-"` UserVm *UserVm `json:"user_vm" gorm:"-"` // } diff --git a/router/router_app.go b/router/router_app.go index 637a207..aa24378 100644 --- a/router/router_app.go +++ b/router/router_app.go @@ -128,7 +128,6 @@ func ConfigAppRouter(r gin.IRouter) { order.POST("express_company/list", controller.ExpressCompanyList) // 物流公司列表 order.POST("order/wx_pay/success", controller.WXPaySuccess) // 微信支付成功 order.POST("cancel", controller.OrderCancel) // 取消租卡 - order.Use(auth.UserAccessAuth) // TODO order.POST("create", controller.RentCardOrderCreate) // 创建租卡 order.POST("pay", controller.OrderPay) // 租卡订单支付