Merge branch 'dev-lzh' into dev

This commit is contained in:
lzh 2025-06-20 14:58:00 +08:00
commit 5c0652888e

View File

@ -65,7 +65,7 @@ func GetBundleExtendRecordList(req *bundle.BundleExtendRecordsListRequest) (data
if utils.IsPhoneNumber(req.User) {
session = session.Where("u.tel_num = ?", req.User)
} else {
session = session.Where("u.nickname like ?", req.User)
session = session.Where("rn.name like ?", req.User)
}
}
if req.Operator != "" {
@ -108,7 +108,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
Joins("LEFT JOIN `micro-account`.`real_name` rn on u.real_name_id = rn.id").
Where("bor.deleted_at IS NULL")
if req.UserName != "" {
session = session.Where("u.nickname like ?", "%"+req.UserName+"%")
session = session.Where("rn.name like ?", "%"+req.UserName+"%")
}
if req.Status != 0 {
session = session.Where("bor.status = ?", req.Status)