Merge branch 'dev-lzh' into dev
This commit is contained in:
commit
107a457111
@ -115,7 +115,11 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
|
|||||||
Joins("LEFT JOIN bundle_order_records bor on bor.uuid = bb.order_uuid").
|
Joins("LEFT JOIN bundle_order_records bor on bor.uuid = bb.order_uuid").
|
||||||
Where("bor.deleted_at IS NULL and rn.name IS NOT NULL")
|
Where("bor.deleted_at IS NULL and rn.name IS NOT NULL")
|
||||||
if req.UserName != "" {
|
if req.UserName != "" {
|
||||||
session = session.Where("rn.name like ?", "%"+req.UserName+"%")
|
if utils.IsPhoneNumber(req.UserName) {
|
||||||
|
session = session.Where("u.tel_num = ?", req.UserName)
|
||||||
|
} else {
|
||||||
|
session = session.Where("rn.name like ?", "%"+req.UserName+"%")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if req.Status != 0 {
|
if req.Status != 0 {
|
||||||
session = session.Where("bor.status = ?", req.Status)
|
session = session.Where("bor.status = ?", req.Status)
|
||||||
|
Loading…
Reference in New Issue
Block a user