Merge branch 'dev-lzh' into dev

This commit is contained in:
lzh 2025-06-18 16:47:34 +08:00
commit 883e5613e6

View File

@ -100,7 +100,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
u.nickname as user_name,
u.tel_num as user_phone_number
`).
Joins("LEFT JOIN bundle_order_records bor on bor.customer_id = bb .user_id").
Joins("INNER JOIN bundle_order_records bor on bor.uuid = bb.order_uuid").
Joins("LEFT JOIN `micro-account`.`user` u on u.id = bb.user_id").
Where("bor.deleted_at IS NULL")
if req.UserName != "" {