diff --git a/api/dao/OrderMember.go b/api/dao/OrderMember.go index b1c3372..6e4d864 100644 --- a/api/dao/OrderMember.go +++ b/api/dao/OrderMember.go @@ -201,6 +201,15 @@ func (r *OrderMemberDao) GetOrderMemberPageSearch(req requests.GetOrderMemberPag query = query.Where(gorm.Expr("user_id IN (?)", subQuery)) } + // 用户手机号 + if req.UserMobile != "" { + subQuery := global.Db.Model(&model.User{}). + Select("user_id"). + Where("user_mobile LIKE ?", "%"+req.UserMobile+"%") + + query = query.Where(gorm.Expr("user_id IN (?)", subQuery)) + } + // 会员天数 if req.MemberDays != nil { subQuery := global.Db.Model(&model.SystemMember{}). diff --git a/api/dao/OrderSingle.go b/api/dao/OrderSingle.go index 8260bfb..a61b501 100644 --- a/api/dao/OrderSingle.go +++ b/api/dao/OrderSingle.go @@ -220,6 +220,15 @@ func (r *OrderSingleDao) GetOrderSinglePageSearch(req requests.GetOrderSinglePag query = query.Where(gorm.Expr("user_id IN (?)", subQuery)) } + // 用户手机号 + if req.UserMobile != "" { + subQuery := global.Db.Model(&model.User{}). + Select("user_id"). + Where("user_mobile LIKE ?", "%"+req.UserMobile+"%") + + query = query.Where(gorm.Expr("user_id IN (?)", subQuery)) + } + // 排序 query = query.Order("created_at desc") diff --git a/api/requests/OrderMember.go b/api/requests/OrderMember.go index baeee7d..16d9cf0 100644 --- a/api/requests/OrderMember.go +++ b/api/requests/OrderMember.go @@ -21,6 +21,7 @@ type GetOrderMemberPage struct { CancelStatus *int `json:"cancel_status" form:"cancel_status" label:"取消状态"` MemberDays *int `json:"member_days" form:"member_days" label:"会员天数"` UserName string `json:"user_name" form:"user_name" label:"用户名称"` + UserMobile string `json:"user_mobile" form:"user_mobile" label:"用户手机号"` } // PutOrderMemberDeleteStatus 操作会员订单删除状态 diff --git a/api/requests/OrderSingle.go b/api/requests/OrderSingle.go index 193e4c6..ef28060 100644 --- a/api/requests/OrderSingle.go +++ b/api/requests/OrderSingle.go @@ -20,6 +20,7 @@ type GetOrderSinglePage struct { EscrowTradeNo string `json:"escrow_trade_no" form:"escrow_trade_no" label:"第三方支付流水号"` CancelStatus *int `json:"cancel_status" form:"cancel_status" label:"取消状态"` UserName string `json:"user_name" form:"user_name" label:"用户名称"` + UserMobile string `json:"user_mobile" form:"user_mobile" label:"用户手机号"` QuestionTitle string `json:"question_title" form:"question_title" label:"问题标题"` }