diff --git a/internal/api/admin/users_profile.go b/internal/api/admin/users_profile.go index 9eeb6ed..24dfc93 100755 --- a/internal/api/admin/users_profile.go +++ b/internal/api/admin/users_profile.go @@ -200,7 +200,7 @@ func (h *handler) GetUserProfile() core.HandlerFunc { COALESCE(SUM(COALESCE(NULLIF(ui.value_cents, 0), p.price, 0)), 0) as value FROM user_inventory ui LEFT JOIN products p ON p.id = ui.product_id - WHERE ui.user_id = ? AND ui.status = 1 + WHERE ui.user_id = ? AND ui.status IN (1, 3) `, userID).Scan(&is).Error rsp.CurrentAssets.InventoryCount = is.Count rsp.CurrentAssets.InventoryValue = is.Value diff --git a/internal/api/admin/users_profit_loss.go b/internal/api/admin/users_profit_loss.go index 18ffa82..ee0cba5 100755 --- a/internal/api/admin/users_profit_loss.go +++ b/internal/api/admin/users_profit_loss.go @@ -91,7 +91,7 @@ func (h *handler) GetUserProfitLossTrend() core.HandlerFunc { SELECT COALESCE(SUM(COALESCE(NULLIF(ui.value_cents, 0), p.price, 0)), 0) FROM user_inventory ui LEFT JOIN products p ON p.id = ui.product_id - WHERE ui.user_id = ? AND ui.status = 1 + WHERE ui.user_id = ? AND ui.status IN (1, 3) `, userID).Scan(&curAssets.Products).Error _ = h.repo.GetDbR().Raw("SELECT COALESCE(SUM(sc.price), 0) FROM user_item_cards uic LEFT JOIN system_item_cards sc ON sc.id = uic.card_id WHERE uic.user_id = ? AND uic.status = 1", userID).Scan(&curAssets.Cards).Error _ = h.repo.GetDbR().Raw("SELECT COALESCE(SUM(balance_amount), 0) FROM user_coupons WHERE user_id = ? AND status = 1", userID).Scan(&curAssets.Coupons).Error