版本预发布

2025-10-12 04:53:47 +08:00 · 2023-02-08 20:29:34 +08:00
parent f11c7c5bf2
commit 2068d05c93
269 changed files with 16122 additions and 12075 deletions
--- a/server/internal/model/input/adminin/member.go
+++ b/server/internal/model/input/adminin/member.go
@@ -12,15 +12,34 @@ import (
 	"hotgo/internal/model/input/form"
 )

-// GetIdByCodeInp 通过邀请码获取会员ID
+// MemberUpdateCashInp 更新会员提现信息
+type MemberUpdateCashInp struct {
+	Name      string `json:"name" v:"required#支付宝姓名不能为空"  dc:"支付宝姓名"`
+	PayeeCode string `json:"payeeCode" v:"required#支付宝收款码不能为空"  dc:"支付宝收款码"`
+	Account   string `json:"account" v:"required#支付宝账号不能为空"  dc:"支付宝账号"`
+	Password  string `json:"password" v:"required#密码不能为空"  dc:"密码"`
+}
+
+type MemberUpdateEmailInp struct {
+	Email string `json:"email"  v:"required#换绑邮箱不能为空"       dc:"换绑邮箱"`
+	Code  string `json:"code" dc:"原邮箱验证码"`
+}
+
+// MemberUpdateMobileInp 换绑手机号
+type MemberUpdateMobileInp struct {
+	Mobile string `json:"mobile"  v:"required#换绑手机号不能为空"       dc:"换绑手机号"`
+	Code   string `json:"code" dc:"原号码短信验证码"`
+}
+
+// GetIdByCodeInp 通过邀请码获取用户ID
 type GetIdByCodeInp struct {
-	Code string `json:"code""`
+	Code string `json:"code"`
 }
 type GetIdByCodeModel struct {
 	Id int64
 }

-// MemberProfileInp 获取指定会员资料
+// MemberProfileInp 获取指定用户资料
 type MemberProfileInp struct {
 	Id int64
 }
@@ -34,30 +53,34 @@ type MemberProfileModel struct {
 	RoleIds   int64            `json:"roleIds" description:"当前角色"`
 }

-// MemberUpdateProfileInp 更新会员资料
+// MemberUpdateProfileInp 更新用户资料
 type MemberUpdateProfileInp struct {
-	Mobile   int
-	Email    string
-	Realname string
+	Avatar   string      `json:"avatar"   v:"required#头像不能为空"     dc:"头像"`
+	RealName string      `json:"realName"  v:"required#真实姓名不能为空"       dc:"真实姓名"`
+	Qq       string      `json:"qq"          dc:"QQ"`
+	Birthday *gtime.Time `json:"birthday"    dc:"生日"`
+	Sex      int         `json:"sex"         dc:"性别"`
+	Address  string      `json:"address"     dc:"联系地址"`
+	CityId   int64       `json:"cityId"      dc:"城市编码"`
 }

 // MemberUpdatePwdInp 修改登录密码
 type MemberUpdatePwdInp struct {
 	Id          int64
-	OldPassword string
-	NewPassword string
+	OldPassword string `json:"oldPassword" v:"required#原密码不能为空"  dc:"原密码"`
+	NewPassword string `json:"newPassword" v:"required|length:6,16#新密码不能为空#新密码需在6~16之间"  dc:"新密码"`
 }

 // MemberResetPwdInp 重置密码
 type MemberResetPwdInp struct {
-	Password string
-	Id       int64
+	Password string `json:"password" v:"required#密码不能为空"  dc:"密码"`
+	Id       int64  `json:"id" dc:"用户ID"`
 }

 // MemberEmailUniqueInp 邮箱是否唯一
 type MemberEmailUniqueInp struct {
-	Email string
-	Id    int64
+	Email string `json:"email" v:"required#邮箱不能为空"  dc:"邮箱"`
+	Id    int64  `json:"id" dc:"用户ID"`
 }

 type MemberEmailUniqueModel struct {
@@ -66,8 +89,8 @@ type MemberEmailUniqueModel struct {

 // MemberMobileUniqueInp 手机号是否唯一
 type MemberMobileUniqueInp struct {
-	Mobile string
-	Id     int64
+	Mobile string `json:"mobile" v:"required#手机号不能为空"  dc:"手机号"`
+	Id     int64  `json:"id" dc:"用户ID"`
 }

 type MemberMobileUniqueModel struct {
@@ -76,8 +99,8 @@ type MemberMobileUniqueModel struct {

 // MemberNameUniqueInp 名称是否唯一
 type MemberNameUniqueInp struct {
-	Username string
-	Id       int64
+	Username string `json:"username" v:"required#用户名称不能为空"  dc:"用户名称"`
+	Id       int64  `json:"id" dc:"用户ID"`
 }

 type MemberNameUniqueModel struct {
@@ -86,7 +109,7 @@ type MemberNameUniqueModel struct {

 // MemberMaxSortInp 最大排序
 type MemberMaxSortInp struct {
-	Id int64
+	Id int64 `json:"id" dc:"用户ID"`
 }

 type MemberMaxSortModel struct {
@@ -101,7 +124,7 @@ type MemberEditInp struct {
 	DeptId     int64       `json:"deptId"       v:"required#部门不能为空"           description:"部门ID"`
 	Username   string      `json:"username"   v:"required#账号不能为空"           description:"帐号"`
 	Password   string      `json:"password"            description:"密码"`
-	Realname   string      `json:"realName"             description:"真实姓名"`
+	RealName   string      `json:"realName"             description:"真实姓名"`
 	Avatar     string      `json:"avatar"               description:"头像"`
 	Sex        string      `json:"sex"                  description:"性别"`
 	Qq         string      `json:"qq"                   description:"qq"`
@@ -120,8 +143,8 @@ type MemberEditInp struct {

 type MemberAddInp struct {
 	MemberEditInp
-	PasswordHash string `json:"passwordHash"            description:"密码hash"`
-	Salt         string `json:"salt"            description:"密码盐"`
+	PasswordHash string `json:"passwordHash"       description:"密码hash"`
+	Salt         string `json:"salt"               description:"密码盐"`
 	Pid          int64  `json:"pid"                description:"上级ID"`
 	Level        int    `json:"level"              description:"等级"`
 	Tree         string `json:"tree"               description:"关系树"`
@@ -131,17 +154,19 @@ type MemberEditModel struct{}

 // MemberDeleteInp 删除字典类型
 type MemberDeleteInp struct {
-	Id interface{}
+	Id interface{} `json:"id" v:"required#用户ID不能为空" dc:"用户ID"`
 }
 type MemberDeleteModel struct{}

 // MemberViewInp 获取信息
 type MemberViewInp struct {
-	Id int64
+	Id int64 `json:"id" dc:"用户ID"`
 }

 type MemberViewModel struct {
 	entity.AdminMember
+	DeptName string `json:"deptName"    description:"所属部门"`
+	RoleName string `json:"roleName"    description:"所属角色"`
 }

 // MemberListInp 获取列表
@@ -149,21 +174,21 @@ type MemberListInp struct {
 	form.PageReq
 	form.RangeDateReq
 	form.StatusReq
-	Name      string
-	Code      string
-	DeptId    int
-	Mobile    int
-	Username  string
-	Realname  string
-	CreatedAt []int64
+	DeptId    int     `json:"deptId"   dc:"部门ID"`
+	Mobile    int     `json:"mobile"   dc:"手机号"`
+	Username  string  `json:"username"   dc:"用户名"`
+	RealName  string  `json:"realName"   dc:"真实姓名"`
+	Name      string  `json:"name"   dc:"岗位名称"`
+	Code      string  `json:"code"   dc:"岗位编码"`
+	CreatedAt []int64 `json:"createdAt"   dc:"创建时间"`
 }

 type MemberListModel struct {
 	entity.AdminMember
-	DeptName string  `json:"deptName"`
-	RoleName string  `json:"roleName"`
-	PostIds  []int64 `json:"postIds"`
-	DeptId   int64   `json:"deptId"             description:"部门ID"`
+	DeptName string  `json:"deptName"    description:"所属部门"`
+	RoleName string  `json:"roleName"    description:"所属角色"`
+	PostIds  []int64 `json:"postIds"     description:"岗位"`
+	DeptId   int64   `json:"deptId"      description:"部门ID"`
 }

 // MemberLoginInp 登录
@@ -172,18 +197,42 @@ type MemberLoginInp struct {
 	Password string
 }
 type MemberLoginModel struct {
-	UserId      int64                     `json:"userId"    description:"会员ID"`
-	Username    string                    `json:"username"    description:"用户名"`
-	RealName    string                    `json:"realName"    description:"昵称"`
-	Avatar      string                    `json:"avatar"       description:"头像"`
-	Token       string                    `json:"token" v:""  description:"登录token"`
-	Permissions []*MemberLoginPermissions `json:"permissions"  description:"角色信息"`
+	Id      int64  `json:"id"              description:"用户ID"`
+	Token   string `json:"token"           description:"登录token"`
+	Expires int64  `json:"expires"         description:"登录有效期"`
+}
+
+type LoginMemberInfoModel struct {
+	Id          int64       `json:"id"                 description:"用户ID"`
+	DeptName    string      `json:"deptName"           description:"所属部门"`
+	RoleName    string      `json:"roleName"           description:"所属角色"`
+	Permissions []string    `json:"permissions"        description:"角色信息"`
+	DeptId      int64       `json:"-"                  description:"部门ID"`
+	RoleId      int64       `json:"-"                  description:"角色ID"`
+	Username    string      `json:"username"           description:"用户名"`
+	RealName    string      `json:"realName"           description:"姓名"`
+	Avatar      string      `json:"avatar"             description:"头像"`
+	Balance     float64     `json:"balance"            description:"余额"`
+	Sex         int         `json:"sex"                description:"性别"`
+	Qq          string      `json:"qq"                 description:"qq"`
+	Email       string      `json:"email"              description:"邮箱"`
+	Mobile      string      `json:"mobile"             description:"手机号码"`
+	Birthday    *gtime.Time `json:"birthday"           description:"生日"`
+	CityId      int64       `json:"cityId"             description:"城市编码"`
+	Address     string      `json:"address"            description:"联系地址"`
+	Cash        *MemberCash `json:"cash"               description:"收款信息"`
+	CreatedAt   *gtime.Time `json:"createdAt"          description:"创建时间"`
+	*MemberLoginStatModel
 }

 // MemberLoginPermissions 登录用户角色信息
-type MemberLoginPermissions struct {
-	Label string `json:"label"    description:"标签"`
-	Value string `json:"value"    description:"值"`
+type MemberLoginPermissions []string
+
+// MemberCash 用户提现配置
+type MemberCash struct {
+	Name      string `json:"name"       dc:"收款人姓名"`
+	Account   string `json:"account"    dc:"收款账户"`
+	PayeeCode string `json:"payeeCode"  dc:"收款码"`
 }

 // MemberStatusInp  更新状态
@@ -191,3 +240,25 @@ type MemberStatusInp struct {
 	entity.AdminPost
 }
 type MemberStatusModel struct{}
+
+// MemberSelectInp 获取可选的后台用户选项
+type MemberSelectInp struct {
+}
+
+type MemberSelectModel struct {
+	Value    int64  `json:"value" dc:"用户ID"`
+	Label    string `json:"label" dc:"真实姓名"`
+	Username string `json:"username" dc:"用户名"`
+	Avatar   string `json:"avatar" dc:"头像"`
+}
+
+// MemberLoginStatInp 用户登录统计
+type MemberLoginStatInp struct {
+	MemberId int64
+}
+
+type MemberLoginStatModel struct {
+	LoginCount  int         `json:"loginCount"  dc:"登录次数"`
+	LastLoginAt *gtime.Time `json:"lastLoginAt" dc:"最后登录时间"`
+	LastLoginIp string      `json:"lastLoginIp" dc:"最后登录IP"`
+}