From 0024b64dcaad2607d4395c73179b189efaa8ea2f Mon Sep 17 00:00:00 2001 From: yml Date: Sun, 15 Nov 2026 19:41:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin-user):=20=E5=A2=9E=E5=8A=A0=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E7=AB=99=E7=82=B9=E5=B1=95=E7=A4=BA=E4=B8=8E=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/modules/adminuser/dto.go | 4 + backend/internal/modules/adminuser/handler.go | 9 +++ .../internal/modules/adminuser/repository.go | 21 +++-- .../modules/adminuser/repository_test.go | 46 +++++++++++ frontend/src/features/admin/api/adminUsers.ts | 5 ++ .../components/AdminUserDetailDrawer.vue | 14 +++- .../admin/views/AdminListingDetailView.vue | 15 +++- .../features/admin/views/AdminUsersView.css | 25 ++++++ .../features/admin/views/AdminUsersView.vue | 79 ++++++++++++++++--- 9 files changed, 197 insertions(+), 21 deletions(-) diff --git a/backend/internal/modules/adminuser/dto.go b/backend/internal/modules/adminuser/dto.go index fdbaee3d..033c3ba6 100644 --- a/backend/internal/modules/adminuser/dto.go +++ b/backend/internal/modules/adminuser/dto.go @@ -4,6 +4,9 @@ import "time" type UserDTO struct { ID uint64 `json:"id"` + TenantID uint64 `json:"tenant_id"` + TenantCode string `json:"tenant_code"` + TenantName string `json:"tenant_name"` Phone string `json:"phone"` Nickname string `json:"nickname"` RealnameStatus string `json:"realname_status"` @@ -75,6 +78,7 @@ type WalletAdjustRequest struct { // ListQuery 用户列表筛选条件。Keyword 同时匹配手机号/昵称(模糊)与用户 ID(精确)。 type ListQuery struct { Keyword string + TenantID uint64 Status string HasDepositFreeQuota bool QualityOwnerOnly bool diff --git a/backend/internal/modules/adminuser/handler.go b/backend/internal/modules/adminuser/handler.go index 932b4c94..12e29e90 100644 --- a/backend/internal/modules/adminuser/handler.go +++ b/backend/internal/modules/adminuser/handler.go @@ -39,6 +39,7 @@ func (h *Handler) List(c *gin.Context) { page, pageSize := parsePagination(c) query := ListQuery{ Keyword: strings.TrimSpace(c.Query("keyword")), + TenantID: parseOptionalUint(c.Query("tenant_id")), Status: strings.TrimSpace(c.Query("status")), HasDepositFreeQuota: parseBoolQuery(c.Query("has_deposit_free_quota")), QualityOwnerOnly: parseBoolQuery(c.Query("quality_owner_only")), @@ -54,6 +55,14 @@ func (h *Handler) List(c *gin.Context) { response.OK(c, result) } +func parseOptionalUint(value string) uint64 { + parsed, err := strconv.ParseUint(strings.TrimSpace(value), 10, 64) + if err != nil { + return 0 + } + return parsed +} + func parseBoolQuery(value string) bool { switch strings.ToLower(strings.TrimSpace(value)) { case "1", "true", "yes", "on": diff --git a/backend/internal/modules/adminuser/repository.go b/backend/internal/modules/adminuser/repository.go index 683aac6f..26d52a02 100644 --- a/backend/internal/modules/adminuser/repository.go +++ b/backend/internal/modules/adminuser/repository.go @@ -60,13 +60,14 @@ func (r *Repository) List(ctx context.Context, page, pageSize int, query ListQue offset := (page - 1) * pageSize var rows []userRow listTx := r.db.WithContext(ctx).Table("users AS u"). - Select(`u.*, + Select(`u.*, COALESCE(t.code, '') AS tenant_code, COALESCE(t.name, '') AS tenant_name, COALESCE(o.order_count, 0) AS order_count, COALESCE(l.listing_count, 0) AS listing_count, COALESCE(d.dispute_count, 0) AS dispute_count, COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent, COALESCE(w.available_balance_cent, 0) AS available_balance_cent, COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`). + Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id"). Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id"). Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id"). Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id"). @@ -86,7 +87,8 @@ func (r *Repository) List(ctx context.Context, page, pageSize int, query ListQue if page == 1 && len(rows) < pageSize { total = int64(len(rows)) } else { - countTx := applyUserFilter(r.db.WithContext(ctx).Table("users AS u"), query, growthConfig) + countTx := applyUserFilter(r.db.WithContext(ctx).Table("users AS u"). + Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id"), query, growthConfig) if err := countTx.Count(&total).Error; err != nil { return nil, err } @@ -104,6 +106,9 @@ func applyUserFilter(tx *gorm.DB, query ListQuery, growthConfig rentergrowth.Con if query.Status != "" { tx = tx.Where("u.status = ?", query.Status) } + if query.TenantID > 0 { + tx = tx.Where("u.tenant_id = ?", query.TenantID) + } depositFreeQuota := query.DepositFreeQuota if depositFreeQuota == "" && query.HasDepositFreeQuota { depositFreeQuota = "has" @@ -136,10 +141,10 @@ func applyUserFilter(tx *gorm.DB, query ListQuery, growthConfig rentergrowth.Con } else if id, err := strconv.ParseUint(keyword, 10, 64); err == nil && id > 0 && keyword[0] != '0' && id < 100000000 { // 纯数字 ID:一并按用户 ID 精确匹配 like := "%" + keyword + "%" - tx = tx.Where("u.id = ? OR u.phone LIKE ? OR u.nickname LIKE ?", id, like, like) + tx = tx.Where("u.id = ? OR u.phone LIKE ? OR u.nickname LIKE ? OR t.name LIKE ? OR t.code LIKE ?", id, like, like, like, like) } else { like := "%" + keyword + "%" - tx = tx.Where("u.phone LIKE ? OR u.nickname LIKE ?", like, like) + tx = tx.Where("u.phone LIKE ? OR u.nickname LIKE ? OR t.name LIKE ? OR t.code LIKE ?", like, like, like, like) } } return tx @@ -529,13 +534,14 @@ func (r *Repository) Find(ctx context.Context, userID uint64) (*UserDTO, error) } var row userRow err = r.db.WithContext(ctx).Table("users AS u"). - Select(`u.*, + Select(`u.*, COALESCE(t.code, '') AS tenant_code, COALESCE(t.name, '') AS tenant_name, COALESCE(o.order_count, 0) AS order_count, COALESCE(l.listing_count, 0) AS listing_count, COALESCE(d.dispute_count, 0) AS dispute_count, COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent, COALESCE(w.available_balance_cent, 0) AS available_balance_cent, COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`). + Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id"). Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id"). Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id"). Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id"). @@ -634,6 +640,8 @@ func (r *Repository) AdjustWallet(ctx context.Context, adminID uint64, userID ui type userRow struct { model.User + TenantCode string + TenantName string OrderCount int64 ListingCount int64 DisputeCount int64 @@ -660,6 +668,9 @@ func (row userRow) toDTO(growthConfig rentergrowth.Config) UserDTO { } return UserDTO{ ID: row.ID, + TenantID: row.TenantID, + TenantCode: row.TenantCode, + TenantName: row.TenantName, Phone: row.Phone, Nickname: row.Nickname, RealnameStatus: row.RealnameStatus, diff --git a/backend/internal/modules/adminuser/repository_test.go b/backend/internal/modules/adminuser/repository_test.go index 48f330b0..992496d4 100644 --- a/backend/internal/modules/adminuser/repository_test.go +++ b/backend/internal/modules/adminuser/repository_test.go @@ -207,6 +207,51 @@ func TestListFiltersByDepositQuotaOwnerTypeAndGrowthLevel(t *testing.T) { } } +func TestListIncludesTenantAndSupportsTenantSearchAndFilter(t *testing.T) { + db := setupAdminUserTestDB(t) + tenants := []model.Tenant{ + {Code: "dachui", Name: "大锤商行", Status: "active"}, + {Code: "jieyou", Name: "解忧商行", Status: "active"}, + } + if err := db.Create(&tenants).Error; err != nil { + t.Fatalf("创建租户失败:%v", err) + } + users := []model.User{ + {TenantID: tenants[0].ID, Phone: "15614832213", Nickname: "大锤同号用户", Status: "active"}, + {TenantID: tenants[1].ID, Phone: "15614832213", Nickname: "解忧同号用户", Status: "active"}, + } + if err := db.Create(&users).Error; err != nil { + t.Fatalf("创建跨站同号用户失败:%v", err) + } + repo := NewRepository(db) + + result, err := repo.List(t.Context(), 1, 20, ListQuery{Keyword: "解忧"}) + if err != nil { + t.Fatalf("按站点名称搜索失败:%v", err) + } + if result.Total != 1 { + t.Fatalf("按站点名称搜索总数 = %d, want 1", result.Total) + } + items := result.Items.([]UserDTO) + if items[0].TenantID != tenants[1].ID || + items[0].TenantCode != "jieyou" || + items[0].TenantName != "解忧商行" { + t.Fatalf("用户站点信息不正确:%+v", items[0]) + } + + result, err = repo.List(t.Context(), 1, 20, ListQuery{TenantID: tenants[0].ID}) + if err != nil { + t.Fatalf("按站点筛选失败:%v", err) + } + if result.Total != 1 { + t.Fatalf("按站点筛选总数 = %d, want 1", result.Total) + } + items = result.Items.([]UserDTO) + if items[0].TenantCode != "dachui" { + t.Fatalf("按站点筛选结果 = %+v, want dachui", items[0]) + } +} + func TestAdjustGrowthPointsWritesRepeatableLedgers(t *testing.T) { db := setupAdminUserTestDB(t) user := model.User{ @@ -537,6 +582,7 @@ func setupAdminUserTestDB(t *testing.T) *gorm.DB { t.Helper() db := database.NewTestDB() if err := database.AutoMigrateIfMissing(db, + &model.Tenant{}, &model.User{}, &model.UserRealname{}, &model.AuditLog{}, diff --git a/frontend/src/features/admin/api/adminUsers.ts b/frontend/src/features/admin/api/adminUsers.ts index 7f216dc5..734561fd 100644 --- a/frontend/src/features/admin/api/adminUsers.ts +++ b/frontend/src/features/admin/api/adminUsers.ts @@ -5,6 +5,9 @@ import type { RealnameStatusValue, RiskStatus, UserStatus } from '@/shared/types export interface AdminUserItem { id: number + tenant_id: number + tenant_code: string + tenant_name: string phone: string nickname: string realname_status: RealnameStatusValue @@ -56,6 +59,7 @@ export interface AdminGrowthLevelAdjustPayload { export interface AdminUserQuery { keyword?: string + tenant_id?: number status?: '' | UserStatus /** has=有免押额度,none=无免押额度,空=全部 */ deposit_free_quota?: '' | 'has' | 'none' @@ -68,6 +72,7 @@ export interface AdminUserQuery { export async function fetchAdminUsers(page = 1, pageSize = 20, query: AdminUserQuery = {}) { const params: Record = { page, page_size: pageSize } if (query.keyword) params.keyword = query.keyword + if (query.tenant_id) params.tenant_id = query.tenant_id if (query.status) params.status = query.status if (query.deposit_free_quota) params.deposit_free_quota = query.deposit_free_quota if (query.owner_type) params.owner_type = query.owner_type diff --git a/frontend/src/features/admin/components/AdminUserDetailDrawer.vue b/frontend/src/features/admin/components/AdminUserDetailDrawer.vue index 61f25ac3..cf48bed0 100644 --- a/frontend/src/features/admin/components/AdminUserDetailDrawer.vue +++ b/frontend/src/features/admin/components/AdminUserDetailDrawer.vue @@ -115,6 +115,14 @@ const paymentPageSize = ref(20) const userId = computed(() => props.user?.id || 0) const userPhone = computed(() => props.user?.phone || '') +const userSiteLabel = computed(() => { + if (!props.user) return '' + return ( + props.user.tenant_name || + props.user.tenant_code || + (props.user.tenant_id ? `站点 #${props.user.tenant_id}` : '未分配站点') + ) +}) watch( () => props.modelValue, @@ -443,7 +451,9 @@ function goPayments() { :model-value="modelValue" size="78%" destroy-on-close - :title="`用户明细 · ${user?.nickname || user?.phone || userId}`" + :title="`用户明细 · ${user?.nickname || user?.phone || userId}${ + userSiteLabel ? ` · ${userSiteLabel}` : '' + }`" @update:model-value="(val: boolean) => emit('update:modelValue', val)" >
@@ -451,7 +461,7 @@ function goPayments() {
{{ user.nickname || '-' }} {{ user.phone }} - UID: {{ user.id }} + {{ userSiteLabel }} · UID: {{ user.id }}
diff --git a/frontend/src/features/admin/views/AdminListingDetailView.vue b/frontend/src/features/admin/views/AdminListingDetailView.vue index 45cf1039..6b61694f 100644 --- a/frontend/src/features/admin/views/AdminListingDetailView.vue +++ b/frontend/src/features/admin/views/AdminListingDetailView.vue @@ -429,6 +429,12 @@ function selectUser(user: AdminUserItem) { selectedUser.value = user } +function userTenantLabel(user: AdminUserItem) { + return ( + user.tenant_name || user.tenant_code || (user.tenant_id ? `站点 #${user.tenant_id}` : '未分配') + ) +} + async function submitAction() { if (!listing.value || !actionType.value) return submitting.value = true @@ -979,7 +985,8 @@ async function openScreenshot(url: string) { {{ selectedUser.nickname || selectedUser.phone }} 请选择用户 ID:{{ selectedUser.id }} · {{ selectedUser.phone || '-' }}{{ userTenantLabel(selectedUser) }} · ID:{{ selectedUser.id }} · + {{ selectedUser.phone || '-' }} 仅支持正常且已实名用户
@@ -990,7 +997,7 @@ async function openScreenshot(url: string) { @@ -1013,7 +1020,9 @@ async function openScreenshot(url: string) { > {{ user.nickname || user.phone || `用户${user.id}` }} - {{ user.phone || '-' }} · ID {{ user.id }} + {{ userTenantLabel(user) }} · {{ user.phone || '-' }} · ID {{ user.id }} {{ userStatusLabel(user.status) }} diff --git a/frontend/src/features/admin/views/AdminUsersView.css b/frontend/src/features/admin/views/AdminUsersView.css index 30ec2fdd..760629eb 100644 --- a/frontend/src/features/admin/views/AdminUsersView.css +++ b/frontend/src/features/admin/views/AdminUsersView.css @@ -29,6 +29,31 @@ color: #94a3b8; } +.tenant-cell { + display: grid; + justify-items: start; + gap: 3px; +} + +.tenant-cell :deep(.el-tag) { + max-width: 120px; + overflow: hidden; + text-overflow: ellipsis; +} + +.tenant-cell small { + color: #94a3b8; + font-size: 10px; + line-height: 1; +} + +.tenant-option-code { + float: right; + margin-left: 16px; + color: #94a3b8; + font-size: 11px; +} + .balance-available { color: #0f172a; font-variant-numeric: tabular-nums; diff --git a/frontend/src/features/admin/views/AdminUsersView.vue b/frontend/src/features/admin/views/AdminUsersView.vue index a58d364a..80d54cbc 100644 --- a/frontend/src/features/admin/views/AdminUsersView.vue +++ b/frontend/src/features/admin/views/AdminUsersView.vue @@ -2,7 +2,7 @@ import { readError } from '@/shared/utils/error' import { ElMessage, ElMessageBox } from 'element-plus' import { Search } from '@element-plus/icons-vue' -import { computed, reactive, ref } from 'vue' +import { computed, reactive, ref, watch } from 'vue' import { adjustAdminUserGrowthLevel, @@ -74,6 +74,7 @@ const walletForm = reactive({ const filters = reactive({ keyword: '', + tenant_id: undefined, status: '', deposit_free_quota: '', owner_type: '', @@ -91,6 +92,30 @@ const { fetchFn: (page, pageSize) => fetchAdminUsers(page, pageSize, filters), }) +const tenantOptions = ref<{ id: number; code: string; name: string }[]>([]) + +watch( + users, + rows => { + const byID = new Map(tenantOptions.value.map(item => [item.id, item])) + for (const row of rows) { + if (row.tenant_id > 0) { + byID.set(row.tenant_id, { + id: row.tenant_id, + code: row.tenant_code, + name: row.tenant_name || row.tenant_code || `站点 #${row.tenant_id}`, + }) + } + } + tenantOptions.value = [...byID.values()].sort((a, b) => a.name.localeCompare(b.name)) + }, + { immediate: true } +) + +function userSiteLabel(row: AdminUserItem) { + return row.tenant_name || row.tenant_code || (row.tenant_id ? `站点 #${row.tenant_id}` : '未分配') +} + function queryUsers() { currentPage.value = 1 void loadUsers() @@ -98,6 +123,7 @@ function queryUsers() { function resetFilters() { filters.keyword = '' + filters.tenant_id = undefined filters.status = '' filters.deposit_free_quota = '' filters.owner_type = '' @@ -437,12 +463,31 @@ function moneyCent(value: number | string | undefined) { + + + + {{ site.name }} + {{ site.code }} + + + + + + @@ -696,7 +749,8 @@ function moneyCent(value: number | string | undefined) { >

- {{ activeUser.phone }} · {{ activeUser.nickname }} + {{ activeUser.phone }} · {{ activeUser.nickname }} · + {{ userSiteLabel(activeUser) }}

- {{ manualRealnameUser.phone }} · {{ manualRealnameUser.nickname }} + {{ manualRealnameUser.phone }} · {{ manualRealnameUser.nickname }} · + {{ userSiteLabel(manualRealnameUser) }}

- {{ realnameUser.phone }} · {{ realnameUser.nickname }} + {{ realnameUser.phone }} · {{ realnameUser.nickname }} · + {{ userSiteLabel(realnameUser) }}

- {{ quotaUser.phone }} · {{ quotaUser.nickname }} + {{ quotaUser.phone }} · {{ quotaUser.nickname }} · + {{ userSiteLabel(quotaUser) }}

等级额度 ¥{{ moneyCent(quotaUser.deposit_free_level_quota_cent) }},人工额度 ¥{{ @@ -830,8 +887,8 @@ function moneyCent(value: number | string | undefined) { >

- {{ growthUser.phone }} · {{ growthUser.nickname || '-' }} · 当前 - {{ growthUser.renter_growth_level_name }} + {{ growthUser.phone }} · {{ growthUser.nickname || '-' }} · + {{ userSiteLabel(growthUser) }} · 当前 {{ growthUser.renter_growth_level_name }}

当前积分 @@ -877,7 +934,7 @@ function moneyCent(value: number | string | undefined) {

{{ growthLevelUser.phone }} · {{ growthLevelUser.nickname || '-' }} · - 当前 + {{ userSiteLabel(growthLevelUser) }} · 当前 {{ growthLevelUser.renter_growth_level_name }} {{ growthLevelUser.renter_growth_level_manual ? '(手动锁定)' : '(自动计算)' }}

@@ -930,8 +987,8 @@ function moneyCent(value: number | string | undefined) { >

- {{ walletUser.phone }} · {{ walletUser.nickname || '-' }} · ID - {{ walletUser.id }} + {{ walletUser.phone }} · {{ walletUser.nickname || '-' }} · + {{ userSiteLabel(walletUser) }} · ID {{ walletUser.id }}