minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:

Browse Source
This commit is contained in:
li 2022-03-08 14:14:24 +08:00
parent ed8892088b
commit 9528744d1e
3 changed files with 163 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
model/autogenerated_user.go
View File

@ -5207,6 +5207,42 @@ func (qs UserQuerySet) One(ret *User) error {
return qs.db.First(ret).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 // OrderAscByAppOpenID is an autogenerated method
// nolint: dupl // nolint: dupl
func (qs UserQuerySet) OrderAscByAppOpenID() UserQuerySet { func (qs UserQuerySet) OrderAscByAppOpenID() UserQuerySet {
@ -5297,6 +5333,12 @@ func (qs UserQuerySet) OrderAscByMemberLevel() UserQuerySet {
return qs.w(qs.db.Order("member_level ASC")) 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 // OrderAscByProvince is an autogenerated method
// nolint: dupl // nolint: dupl
func (qs UserQuerySet) OrderAscByProvince() UserQuerySet { func (qs UserQuerySet) OrderAscByProvince() UserQuerySet {
@ -5459,6 +5501,12 @@ func (qs UserQuerySet) OrderDescByMemberLevel() UserQuerySet {
return qs.w(qs.db.Order("member_level DESC")) 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 // OrderDescByProvince is an autogenerated method
// nolint: dupl // nolint: dupl
func (qs UserQuerySet) OrderDescByProvince() UserQuerySet { func (qs UserQuerySet) OrderDescByProvince() UserQuerySet {
@ -6360,6 +6408,13 @@ func (u UserUpdater) SetMemberLevel(memberLevel uint32) UserUpdater {
return u 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 // SetProvince is an autogenerated method
// nolint: dupl // nolint: dupl
func (u UserUpdater) SetProvince(province string) UserUpdater { func (u UserUpdater) SetProvince(province string) UserUpdater {
@ -6472,95 +6527,98 @@ func (f UserDBSchemaField) String() string {
// UserDBSchema stores db field names of User // UserDBSchema stores db field names of User
var UserDBSchema = struct { var UserDBSchema = struct {
ID UserDBSchemaField ID UserDBSchemaField
CreatedAt UserDBSchemaField CreatedAt UserDBSchemaField
UpdatedAt UserDBSchemaField UpdatedAt UserDBSchemaField
DeletedAt UserDBSchemaField DeletedAt UserDBSchemaField
Uid UserDBSchemaField Uid UserDBSchemaField
MemberLevel UserDBSchemaField MemberLevel UserDBSchemaField
MemberExpire UserDBSchemaField MemberExpire UserDBSchemaField
Bond UserDBSchemaField OpenMemberTime UserDBSchemaField
WxName UserDBSchemaField Bond UserDBSchemaField
WxAvatar UserDBSchemaField WxName UserDBSchemaField
WxOpenID UserDBSchemaField WxAvatar UserDBSchemaField
AppOpenID UserDBSchemaField WxOpenID UserDBSchemaField
WxUnionID UserDBSchemaField AppOpenID UserDBSchemaField
Tel UserDBSchemaField WxUnionID UserDBSchemaField
Gender UserDBSchemaField Tel UserDBSchemaField
City UserDBSchemaField Gender UserDBSchemaField
Province UserDBSchemaField City UserDBSchemaField
Country UserDBSchemaField Province UserDBSchemaField
Deposit UserDBSchemaField Country UserDBSchemaField
UserType UserDBSchemaField Deposit UserDBSchemaField
StoreId UserDBSchemaField UserType UserDBSchemaField
InviteCodeUrl UserDBSchemaField StoreId UserDBSchemaField
LastLoginAt UserDBSchemaField InviteCodeUrl UserDBSchemaField
IP UserDBSchemaField LastLoginAt UserDBSchemaField
InBlack UserDBSchemaField IP UserDBSchemaField
StoreType UserDBSchemaField InBlack UserDBSchemaField
Version UserDBSchemaField StoreType UserDBSchemaField
Version UserDBSchemaField
}{ }{
ID: UserDBSchemaField("id"), ID: UserDBSchemaField("id"),
CreatedAt: UserDBSchemaField("created_at"), CreatedAt: UserDBSchemaField("created_at"),
UpdatedAt: UserDBSchemaField("updated_at"), UpdatedAt: UserDBSchemaField("updated_at"),
DeletedAt: UserDBSchemaField("deleted_at"), DeletedAt: UserDBSchemaField("deleted_at"),
Uid: UserDBSchemaField("uid"), Uid: UserDBSchemaField("uid"),
MemberLevel: UserDBSchemaField("member_level"), MemberLevel: UserDBSchemaField("member_level"),
MemberExpire: UserDBSchemaField("member_expire"), MemberExpire: UserDBSchemaField("member_expire"),
Bond: UserDBSchemaField("bond"), OpenMemberTime: UserDBSchemaField("open_member_time"),
WxName: UserDBSchemaField("wx_name"), Bond: UserDBSchemaField("bond"),
WxAvatar: UserDBSchemaField("wx_avatar"), WxName: UserDBSchemaField("wx_name"),
WxOpenID: UserDBSchemaField("wx_open_id"), WxAvatar: UserDBSchemaField("wx_avatar"),
AppOpenID: UserDBSchemaField("app_open_id"), WxOpenID: UserDBSchemaField("wx_open_id"),
WxUnionID: UserDBSchemaField("wx_union_id"), AppOpenID: UserDBSchemaField("app_open_id"),
Tel: UserDBSchemaField("tel"), WxUnionID: UserDBSchemaField("wx_union_id"),
Gender: UserDBSchemaField("gender"), Tel: UserDBSchemaField("tel"),
City: UserDBSchemaField("city"), Gender: UserDBSchemaField("gender"),
Province: UserDBSchemaField("province"), City: UserDBSchemaField("city"),
Country: UserDBSchemaField("country"), Province: UserDBSchemaField("province"),
Deposit: UserDBSchemaField("deposit"), Country: UserDBSchemaField("country"),
UserType: UserDBSchemaField("user_type"), Deposit: UserDBSchemaField("deposit"),
StoreId: UserDBSchemaField("store_id"), UserType: UserDBSchemaField("user_type"),
InviteCodeUrl: UserDBSchemaField("invite_code_url"), StoreId: UserDBSchemaField("store_id"),
LastLoginAt: UserDBSchemaField("last_login_at"), InviteCodeUrl: UserDBSchemaField("invite_code_url"),
IP: UserDBSchemaField("ip"), LastLoginAt: UserDBSchemaField("last_login_at"),
InBlack: UserDBSchemaField("in_black"), IP: UserDBSchemaField("ip"),
StoreType: UserDBSchemaField("store_type"), InBlack: UserDBSchemaField("in_black"),
Version: UserDBSchemaField("version"), StoreType: UserDBSchemaField("store_type"),
Version: UserDBSchemaField("version"),
} }
// Update updates User fields by primary key // Update updates User fields by primary key
// nolint: dupl // nolint: dupl
func (o *User) Update(db *gorm.DB, fields ...UserDBSchemaField) error { func (o *User) Update(db *gorm.DB, fields ...UserDBSchemaField) error {
dbNameToFieldName := map[string]interface{}{ dbNameToFieldName := map[string]interface{}{
"id": o.ID, "id": o.ID,
"created_at": o.CreatedAt, "created_at": o.CreatedAt,
"updated_at": o.UpdatedAt, "updated_at": o.UpdatedAt,
"deleted_at": o.DeletedAt, "deleted_at": o.DeletedAt,
"uid": o.Uid, "uid": o.Uid,
"member_level": o.MemberLevel, "member_level": o.MemberLevel,
"member_expire": o.MemberExpire, "member_expire": o.MemberExpire,
"bond": o.Bond, "open_member_time": o.OpenMemberTime,
"wx_name": o.WxName, "bond": o.Bond,
"wx_avatar": o.WxAvatar, "wx_name": o.WxName,
"wx_open_id": o.WxOpenID, "wx_avatar": o.WxAvatar,
"app_open_id": o.AppOpenID, "wx_open_id": o.WxOpenID,
"wx_union_id": o.WxUnionID, "app_open_id": o.AppOpenID,
"tel": o.Tel, "wx_union_id": o.WxUnionID,
"gender": o.Gender, "tel": o.Tel,
"city": o.City, "gender": o.Gender,
"province": o.Province, "city": o.City,
"country": o.Country, "province": o.Province,
"deposit": o.Deposit, "country": o.Country,
"user_type": o.UserType, "deposit": o.Deposit,
"store_id": o.StoreId, "user_type": o.UserType,
"invite_code_url": o.InviteCodeUrl, "store_id": o.StoreId,
"last_login_at": o.LastLoginAt, "invite_code_url": o.InviteCodeUrl,
"ip": o.IP, "last_login_at": o.LastLoginAt,
"in_black": o.InBlack, "ip": o.IP,
"store_type": o.StoreType, "in_black": o.InBlack,
"version": o.Version, "store_type": o.StoreType,
"version": o.Version,
} }
u := map[string]interface{}{} u := map[string]interface{}{}
for _, f := range fields { for _, f := range fields {

48
model/user.go
View File

@ -15,30 +15,30 @@ import (
type User struct { type User struct {
Model Model
Uid uint32 `json:"uid" gorm:"column:uid;unique_index"` Uid uint32 `json:"uid" gorm:"column:uid;unique_index"`
MemberLevel uint32 `json:"member_level"` // 会员等级 1-用户 2-会员 MemberLevel uint32 `json:"member_level"` // 会员等级 1-用户 2-会员
MemberExpire time.Time `json:"member_expire"` // 会员到期时间 MemberExpire time.Time `json:"member_expire"` // 会员到期时间
Bond uint32 `json:"bond"` // 保证金 OpenMemberTime time.Time `json:"open_member_time"` // 开通会员
WxName string `json:"wx_name"` // 昵称 Bond uint32 `json:"bond"` // 保证金
WxAvatar string `json:"wx_avatar"` // 头像 WxName string `json:"wx_name"` // 昵称
WxOpenID string `json:"wx_open_id"` WxAvatar string `json:"wx_avatar"` // 头像
AppOpenID string `json:"app_open_id"` WxOpenID string `json:"wx_open_id"`
WxUnionID string `json:"wx_union_id"` AppOpenID string `json:"app_open_id"`
Tel string `json:"tel"` // 电话 WxUnionID string `json:"wx_union_id"`
Gender uint8 `json:"gender"` // 性别 Tel string `json:"tel"` // 电话
City string `json:"city"` // 城市 Gender uint8 `json:"gender"` // 性别
Province string `json:"province"` // 省 City string `json:"city"` // 城市
Country string `json:"country"` // 市 Province string `json:"province"` // 省
Deposit uint32 `json:"deposit"` // Country string `json:"country"` // 市
UserType uint8 `json:"user_type"` // 用户类型 1-普通用户 2-店员 Deposit uint32 `json:"deposit"` //
StoreId uint64 `json:"store_id"` // 门店id UserType uint8 `json:"user_type"` // 用户类型 1-普通用户 2-店员
InviteCodeUrl string `json:"invite_code_url"` // 分享二维码 StoreId uint64 `json:"store_id"` // 门店id
LastLoginAt time.Time `json:"last_login_at"` // 最近登录时间 InviteCodeUrl string `json:"invite_code_url"` // 分享二维码
IP string `json:"-" gorm:"type:varchar(60)"` // ip LastLoginAt time.Time `json:"last_login_at"` // 最近登录时间
InBlack bool `json:"in_black"` // 是否在黑名单 IP string `json:"-" gorm:"type:varchar(60)"` // ip
StoreType uint8 `json:"store_type"` // 1-订单门店 InBlack bool `json:"in_black"` // 是否在黑名单
Version uint32 `json:"-"` StoreType uint8 `json:"store_type"` // 1-订单门店
Version uint32 `json:"-"`
UserVm *UserVm `json:"user_vm" gorm:"-"` // UserVm *UserVm `json:"user_vm" gorm:"-"` //
} }

1
router/router_app.go
View File

@ -128,7 +128,6 @@ func ConfigAppRouter(r gin.IRouter) {
order.POST("express_company/list", controller.ExpressCompanyList) // 物流公司列表 order.POST("express_company/list", controller.ExpressCompanyList) // 物流公司列表
order.POST("order/wx_pay/success", controller.WXPaySuccess) // 微信支付成功 order.POST("order/wx_pay/success", controller.WXPaySuccess) // 微信支付成功
order.POST("cancel", controller.OrderCancel) // 取消租卡 order.POST("cancel", controller.OrderCancel) // 取消租卡
order.Use(auth.UserAccessAuth) // TODO order.Use(auth.UserAccessAuth) // TODO
order.POST("create", controller.RentCardOrderCreate) // 创建租卡 order.POST("create", controller.RentCardOrderCreate) // 创建租卡
order.POST("pay", controller.OrderPay) // 租卡订单支付 order.POST("pay", controller.OrderPay) // 租卡订单支付