lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 12 Activity

优化交易创建流程，客户管理新增折扣与来源字段及功能

Browse Source
This commit is contained in:
luorijun
2026-03-27 16:16:55 +08:00
parent 75ad12efb3
commit 7e8d824ba6
26 changed files with 523 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/models/product_discount.go
View File

@@ -13,7 +13,7 @@ type ProductDiscount struct {
Discount int32 `json:"discount" gorm:"column:discount"` // 产品折扣
}
func (pd ProductDiscount) Decimal() decimal.Decimal {
func (pd ProductDiscount) Rate() decimal.Decimal {
return decimal.NewFromInt32(pd.Discount).
Div(decimal.NewFromInt32(100))
}

17
web/models/user.go
View File

@@ -12,10 +12,12 @@ import (
type User struct {
core.Model
AdminID *int32 `json:"admin_id,omitempty" gorm:"column:admin_id"` // 管理员ID
DiscountID *int32 `json:"discount_id,omitempty" gorm:"column:discount_id"` // 折扣ID
Phone string `json:"phone" gorm:"column:phone"` // 手机号码
Username *string `json:"username,omitempty" gorm:"column:username"` // 用户名
Email *string `json:"email,omitempty" gorm:"column:email"` // 邮箱
Password *string `json:"password,omitempty" gorm:"column:password"` // 用户密码
Source *UserSource `json:"source,omitempty" gorm:"column:source"` // 用户来源：0-官网注册，1-管理员添加，2-代理商注册，3-代理商添加
Name *string `json:"name,omitempty" gorm:"column:name"` // 真实姓名
Avatar *string `json:"avatar,omitempty" gorm:"column:avatar"` // 头像URL
Status UserStatus `json:"status" gorm:"column:status"` // 用户状态：0-禁用，1-正常
@@ -29,8 +31,9 @@ type User struct {
LastLoginIP *orm.Inet `json:"last_login_ip,omitempty" gorm:"column:last_login_ip"` // 最后登录地址
LastLoginUA *string `json:"last_login_ua,omitempty" gorm:"column:last_login_ua"` // 最后登录代理
Admin *Admin `json:"admin,omitempty" gorm:"foreignKey:AdminID"`
Roles []*UserRole `json:"roles" gorm:"many2many:link_user_role"`
Admin *Admin `json:"admin,omitempty" gorm:"foreignKey:AdminID"`
Roles []*UserRole `json:"roles" gorm:"many2many:link_user_role"`
Discount *ProductDiscount `json:"discount,omitempty" gorm:"foreignKey:DiscountID"`
}
// UserStatus 用户状态枚举
@@ -49,3 +52,13 @@ const (
UserIDTypePersonal UserIDType = 1 // 个人认证
UserIDTypeEnterprise UserIDType = 2 // 企业认证
)
// UserSource 用户来源枚举
type UserSource int
const (
UserSourceReg UserSource = 0 // 官网注册
UserSourceAdd UserSource = 1 // 管理员添加
UserSourceAgentReg UserSource = 2 // 代理商注册
UserSourceAgentAdd UserSource = 3 // 代理商添加
)