Merge branch 'dev-lzh' into dev

This commit is contained in:
lzh 2025-06-24 14:03:55 +08:00
commit e8f76dd102

View File

@ -113,7 +113,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
Joins("LEFT JOIN fiee_bundle.bundle_balance AS bb on u.id = bb.user_id").
Joins("LEFT JOIN `micro-account`.`real_name` rn on u.real_name_id = rn.id").
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 and u.deleted_at = 0")
if req.UserName != "" {
if utils.IsPhoneNumber(req.UserName) {
session = session.Where("u.tel_num = ?", req.UserName)