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

58
model/autogenerated_user.go
View File

@ -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 {
@ -6479,6 +6534,7 @@ var UserDBSchema = struct {
Uid UserDBSchemaField
MemberLevel UserDBSchemaField
MemberExpire UserDBSchemaField
OpenMemberTime UserDBSchemaField
Bond UserDBSchemaField
WxName UserDBSchemaField
WxAvatar UserDBSchemaField
@ -6508,6 +6564,7 @@ var UserDBSchema = struct {
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"),
@ -6541,6 +6598,7 @@ func (o *User) Update(db *gorm.DB, fields ...UserDBSchemaField) error {
"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,

2
model/user.go
View File

@ -18,6 +18,7 @@ type User struct {
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"` // 头像
@ -38,7 +39,6 @@ type User struct {
InBlack bool `json:"in_black"` // 是否在黑名单
StoreType uint8 `json:"store_type"` // 1-订单门店
Version uint32 `json:"-"`
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("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) // 租卡订单支付