Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/dao/internal/store_desktop_settings.go
#	internal/dao/internal/store_roles.go
#	internal/dao/store_desktop_settings.go
#	internal/dao/store_roles.go

api/storeAdmin/storeAdmin.go

@@ -12,4 +12,9 @@ import (
 
 type IStoreAdminV1 interface {
 	Info(ctx context.Context, req *v1.InfoReq) (res *v1.InfoRes, err error)
+	List(ctx context.Context, req *v1.ListReq) (res *v1.ListRes, err error)
+	Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error)
+	Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error)
+	EditPassword(ctx context.Context, req *v1.EditPasswordReq) (res *v1.EditPasswordRes, err error)
+	Delete(ctx context.Context, req *v1.DeleteReq) (res *v1.DeleteRes, err error)
 }

api/storeAdmin/v1/storeAdmin.go

@@ -3,10 +3,61 @@ package v1
 import "github.com/gogf/gf/v2/frame/g"
 
 type InfoReq struct {
-	g.Meta `path:"/store/info" method:"get" tags:"StoreAdmin" summary:"(系统、商户门店后台)获取门店管理员信息"`
+	g.Meta `path:"/store/admin/info" method:"get" tags:"StoreAdmin" summary:"(系统、商户门店后台)获取门店管理员信息"`
 }
 
 type InfoRes struct {
 	Id       int64  `json:"id"`
 	Username string `json:"username"`
 }
+type ListReq struct {
+	g.Meta  `path:"/store/admin" method:"get" tags:"StoreAdmin" summary:"(系统、商户门店后台)门店管理员列表"`
+	Page    int   `json:"page" v:"required#页数不能为空"`
+	Size    int   `json:"size" v:"required#页大小不能为空"`
+	StoreId int64 `json:"storeId" v:"required#门店ID不能为空"`
+}
+type ListRes struct {
+	List  interface{} `json:"list"`
+	Total int         `json:"total"`
+}
+
+type CreateReq struct {
+	g.Meta      `path:"/store/admin" method:"post" tags:"StoreAdmin" summary:"(系统、商户门店后台)创建门店管理员"`
+	Realname    string `json:"realname" v:"required#真实姓名不能为空"`
+	StoreId     int64  `json:"storeId" v:"required#门店ID不能为空"`
+	Username    string `json:"username" v:"required#用户名不能为空"`
+	Password    string `json:"password" v:"required#密码不能为空"`
+	Password2   string `json:"password2" v:"required#确认密码不能为空|same:password"`
+	Phone       string `json:"phone" v:"required#手机号不能为空"`
+	StoreRoleId int    `json:"storeRoleId" v:"required#角色ID不能为空"`
+}
+type CreateRes struct {
+	Id int64 `json:"id"`
+}
+
+type UpdateReq struct {
+	g.Meta      `path:"/store/admin" method:"put" tags:"StoreAdmin" summary:"(系统、商户门店后台)更新门店管理员"`
+	Id          int64  `json:"id" v:"required#门店管理员ID不能为空"`
+	Realname    string `json:"realname" v:"required#真实姓名不能为空"`
+	StoreRoleId int    `json:"storeRoleId" v:"required#角色ID不能为空"`
+	Phone       string `json:"phone" v:"required#手机号不能为空"`
+}
+type UpdateRes struct {
+	Success bool `json:"success"`
+}
+type EditPasswordReq struct {
+	g.Meta  `path:"/store/admin/password" method:"post" tags:"StoreAdmin" summary:"(系统、商户门店后台)修改门店管理员密码"`
+	Id      int64  `json:"id" v:"required#门店管理员ID不能为空"`
+	OldPass string `json:"oldPass" v:"required#旧密码不能为空"`
+	NewPass string `json:"newPass" v:"required#新密码不能为空"`
+}
+type EditPasswordRes struct {
+	Success bool `json:"success"`
+}
+type DeleteReq struct {
+	g.Meta `path:"/store/admin/{id}" method:"delete" tags:"StoreAdmin" summary:"(系统、商户门店后台)删除门店管理员"`
+	Id     int64 `in:"path" json:"id" v:"required#门店管理员ID不能为空"`
+}
+type DeleteRes struct {
+	Success bool `json:"success"`
+}

api/storeRole/storeRole.go

@@ -0,0 +1,18 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package storeRole
+
+import (
+	"context"
+
+	"server/api/storeRole/v1"
+)
+
+type IStoreRoleV1 interface {
+	List(ctx context.Context, req *v1.ListReq) (res *v1.ListRes, err error)
+	Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error)
+	Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error)
+	Delete(ctx context.Context, req *v1.DeleteReq) (res *v1.DeleteRes, err error)
+}

api/storeRole/v1/storeRole.go

@@ -0,0 +1,37 @@
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type ListReq struct {
+	g.Meta  `path:"/store/role" method:"get" tags:"StoreRole" summary:"(系统、商户门店后台)获取门店角色列表"`
+	StoreId int64 `json:"storeId" v:"required#门店ID不能为空" dc:"门店ID"`
+	Page    int   `json:"page" dc:"页数"`
+	Size    int   `json:"size" dc:"页大小"`
+}
+type ListRes struct {
+	List  interface{} `json:"list"`
+	Total int         `json:"total"`
+}
+type CreateReq struct {
+	g.Meta  `path:"/store/role" method:"post" tags:"StoreRole" summary:"(系统、商户门店后台)创建门店角色"`
+	StoreId int64  `json:"storeId" v:"required#门店ID不能为空" dc:"门店ID"`
+	Name    string `json:"name" v:"required#角色名称不能为空" dc:"角色名称"`
+}
+type CreateRes struct {
+	Id int64 `json:"id"`
+}
+type UpdateReq struct {
+	g.Meta `path:"/store/role" method:"put" tags:"StoreRole" summary:"(系统、商户门店后台)更新门店角色"`
+	Id     int64  `json:"id" v:"required#角色ID不能为空" dc:"角色ID"`
+	Name   string `json:"name" v:"required#角色名称不能为空" dc:"角色名称"`
+}
+type UpdateRes struct {
+	Success bool `json:"success" dc:"是否成功"`
+}
+type DeleteReq struct {
+	g.Meta `path:"/store/role/{id}" method:"delete" tags:"StoreRole" summary:"(系统、商户门店后台)删除门店角色"`
+	Id     int64 `in:"path" json:"id" v:"required#角色ID不能为空" dc:"角色ID"`
+}
+type DeleteRes struct {
+	Success bool `json:"success" dc:"是否成功"`
+}