Merge branch 'dev-lzh' into dev

This commit is contained in:
lzh 2025-06-18 16:36:04 +08:00
commit e5255d3022

View File

@ -101,7 +101,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
u.tel_num as user_phone_number u.tel_num as user_phone_number
`). `).
Joins("LEFT JOIN bundle_order_records bor on bor.customer_id = bb .user_id"). Joins("LEFT JOIN bundle_order_records bor on bor.customer_id = bb .user_id").
Joins("LEFT JOIN `micro-account`.`user` u on u.id = bb.user_id") Joins("LEFT JOIN `micro-account`.`user` u on u.id = bb.user_id").
Where("bor.deleted_at IS NOT NULL")
if req.UserName != "" { if req.UserName != "" {
session = session.Where("u.nickname like ?", "%"+req.UserName+"%") session = session.Where("u.nickname like ?", "%"+req.UserName+"%")
} }