优化交易创建流程,客户管理新增折扣与来源字段及功能
This commit is contained in:
@@ -28,8 +28,14 @@ func PageUserByAdmin(c *fiber.Ctx) error {
|
||||
|
||||
// 构建查询条件
|
||||
do := q.User.Where()
|
||||
if req.Phone != nil {
|
||||
do = do.Where(q.User.Phone.Eq(*req.Phone))
|
||||
if req.Account != nil {
|
||||
do = do.Where(q.User.Where(
|
||||
q.User.Username.Like("%" + *req.Account + "%"),
|
||||
).Or(
|
||||
q.User.Phone.Like("%" + *req.Account + "%"),
|
||||
).Or(
|
||||
q.User.Email.Like("%" + *req.Account + "%"),
|
||||
))
|
||||
}
|
||||
if req.Name != nil {
|
||||
do = do.Where(q.User.Name.Eq(*req.Name))
|
||||
@@ -57,7 +63,7 @@ func PageUserByAdmin(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
// 查询用户列表
|
||||
users, total, err := q.User.
|
||||
users, total, err := q.User.Debug().
|
||||
Preload(q.User.Admin).
|
||||
Omit(q.User.Password).
|
||||
Where(do).
|
||||
@@ -85,7 +91,7 @@ func PageUserByAdmin(c *fiber.Ctx) error {
|
||||
|
||||
type PageUserByAdminReq struct {
|
||||
core.PageReq
|
||||
Phone *string `json:"phone,omitempty" validate:"omitempty,number"`
|
||||
Account *string `json:"account,omitempty"`
|
||||
Name *string `json:"name,omitempty"`
|
||||
Identified *bool `json:"identified,omitempty"`
|
||||
Enabled *bool `json:"enabled,omitempty"`
|
||||
|
||||
Reference in New Issue
Block a user