feat: update user detail
This commit is contained in:
yanghao05
@@ -116,4 +116,15 @@ func (r *Routes) Register(router fiber.Router) {
|
||||
Query[UserListQuery]("query"),
|
||||
))
|
||||
|
||||
router.Get("/v1/admin/users/:id", DataFunc1(
|
||||
r.users.Show,
|
||||
PathParam[int64]("id"),
|
||||
))
|
||||
|
||||
router.Get("/v1/admin/users/:id/articles", DataFunc2(
|
||||
r.users.Articles,
|
||||
PathParam[int64]("id"),
|
||||
Query[requests.Pagination]("pagination"),
|
||||
))
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package admin
|
||||
import (
|
||||
"quyun/app/models"
|
||||
"quyun/app/requests"
|
||||
"quyun/database/schemas/public/model"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
)
|
||||
@@ -22,3 +23,18 @@ func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Us
|
||||
cond := models.Users.BuildConditionWithKey(query.Keyword)
|
||||
return models.Users.List(ctx.Context(), pagination, cond)
|
||||
}
|
||||
|
||||
// Show user
|
||||
// @Router /v1/admin/users/:id [get]
|
||||
// @Bind id path
|
||||
func (ctl *users) Show(ctx fiber.Ctx, id int64) (*model.Users, error) {
|
||||
return models.Users.GetByID(ctx.Context(), id)
|
||||
}
|
||||
|
||||
// Articles show user bought articles
|
||||
// @Router /v1/admin/users/:id/articles [get]
|
||||
// @Bind id path
|
||||
// @Bind pagination query
|
||||
func (ctl *users) Articles(ctx fiber.Ctx, id int64, pagination *requests.Pagination) (*requests.Pager, error) {
|
||||
return models.Posts.Bought(ctx.Context(), id, pagination)
|
||||
}
|
||||
|
||||
@@ -286,3 +286,60 @@ func (m *postsModel) BoughtStatistics(ctx context.Context, postIds []int64) (map
|
||||
|
||||
return resultMap, nil
|
||||
}
|
||||
|
||||
// Bought
|
||||
func (m *postsModel) Bought(ctx context.Context, userId int64, pagination *requests.Pagination) (*requests.Pager, error) {
|
||||
pagination.Format()
|
||||
|
||||
// select up.price,up.created_at,p.* from user_posts up left join posts p on up.post_id = p.id where up.user_id =1
|
||||
tbl := table.UserPosts
|
||||
stmt := tbl.
|
||||
SELECT(
|
||||
tbl.Price.AS("price"),
|
||||
tbl.CreatedAt.AS("bought_at"),
|
||||
table.Posts.Title.AS("title"),
|
||||
).
|
||||
FROM(
|
||||
tbl.INNER_JOIN(table.Posts, table.Posts.ID.EQ(tbl.PostID)),
|
||||
).
|
||||
WHERE(
|
||||
tbl.UserID.EQ(Int64(1)),
|
||||
).
|
||||
ORDER_BY(tbl.ID.DESC()).
|
||||
LIMIT(pagination.Limit).
|
||||
OFFSET(pagination.Offset)
|
||||
|
||||
m.log.Infof("sql: %s", stmt.DebugSql())
|
||||
|
||||
var items []struct {
|
||||
Title string `json:"title"`
|
||||
Price int64 `json:"price"`
|
||||
BoughtAt time.Time `json:"bought_at"`
|
||||
}
|
||||
|
||||
if err := stmt.QueryContext(ctx, db, &items); err != nil {
|
||||
m.log.Errorf("error getting bought posts: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// convert to model.Posts
|
||||
var cnt struct {
|
||||
Cnt int64
|
||||
}
|
||||
stmtCnt := tbl.
|
||||
SELECT(COUNT(tbl.ID).AS("cnt")).
|
||||
WHERE(
|
||||
tbl.UserID.EQ(Int64(userId)),
|
||||
)
|
||||
|
||||
if err := stmtCnt.QueryContext(ctx, db, &cnt); err != nil {
|
||||
m.log.Errorf("error getting bought posts count: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &requests.Pager{
|
||||
Items: items,
|
||||
Total: cnt.Cnt,
|
||||
Pagination: *pagination,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -19,4 +19,10 @@ export const userService = {
|
||||
deleteUser(id) {
|
||||
return httpClient.delete(`/admin/users/${id}`);
|
||||
},
|
||||
getUserById(id) {
|
||||
return httpClient.get(`/admin/users/${id}`);
|
||||
},
|
||||
getUserArticles(userId) {
|
||||
return httpClient.get(`/admin/users/${userId}/articles`);
|
||||
}
|
||||
}
|
||||
57
frontend/admin/src/api/user_articles.json
Normal file
57
frontend/admin/src/api/user_articles.json
Normal file
@@ -0,0 +1,57 @@
|
||||
{
|
||||
"page": 1,
|
||||
"limit": 10,
|
||||
"total": 10,
|
||||
"items": [
|
||||
{
|
||||
"title": "test-title-9",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.629569Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-8",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.625099Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-7",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.62019Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-6",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.614768Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-5",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.610985Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-4",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.605659Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-3",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.602181Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-2",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.599001Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-1",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.594752Z"
|
||||
},
|
||||
{
|
||||
"title": "test-title-0",
|
||||
"price": 0,
|
||||
"bought_at": "2025-04-11T15:08:06.585365Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
127
frontend/admin/src/pages/UserDetail.vue
Normal file
127
frontend/admin/src/pages/UserDetail.vue
Normal file
@@ -0,0 +1,127 @@
|
||||
<script setup>
|
||||
import { userService } from '@/api/userService';
|
||||
import { formatDate } from '@/utils/date';
|
||||
import Badge from 'primevue/badge';
|
||||
import Button from 'primevue/button';
|
||||
import Column from 'primevue/column';
|
||||
import DataTable from 'primevue/datatable';
|
||||
import ProgressSpinner from 'primevue/progressspinner';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const loading = ref(false);
|
||||
const user = ref(null);
|
||||
const userArticles = ref([]);
|
||||
const totalArticles = ref(0);
|
||||
const lazyParams = ref({
|
||||
page: 1,
|
||||
limit: 10
|
||||
});
|
||||
|
||||
const fetchUserDetail = async () => {
|
||||
loading.value = true;
|
||||
try {
|
||||
const response = await userService.getUserById(route.params.id);
|
||||
user.value = response.data;
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch user details:', error);
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const fetchUserArticles = async () => {
|
||||
try {
|
||||
const response = await userService.getUserArticles(
|
||||
route.params.id,
|
||||
lazyParams.value.page,
|
||||
lazyParams.value.limit
|
||||
);
|
||||
userArticles.value = response.data.items;
|
||||
totalArticles.value = response.data.total;
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch user articles:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const handleBack = () => {
|
||||
router.push('/users');
|
||||
};
|
||||
|
||||
const onPage = (event) => {
|
||||
lazyParams.value = {
|
||||
page: event.page + 1,
|
||||
limit: event.rows
|
||||
};
|
||||
fetchUserArticles();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
fetchUserDetail();
|
||||
fetchUserArticles();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="w-full">
|
||||
<div class="flex justify-between items-center mb-6">
|
||||
<div class="flex items-center gap-4">
|
||||
<Button icon="pi pi-arrow-left" text @click="handleBack" />
|
||||
<h1 class="text-2xl font-semibold text-gray-800">用户详情</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="loading" class="flex justify-center items-center p-8">
|
||||
<ProgressSpinner />
|
||||
</div>
|
||||
|
||||
<div v-else-if="user" class="grid grid-cols-1 gap-6">
|
||||
<!-- 用户基本信息卡片 -->
|
||||
<div class="card p-6">
|
||||
<div class="flex items-start space-x-6">
|
||||
<img :src="user.avatar" :alt="user.username" class="w-24 h-24 rounded-lg">
|
||||
<div class="flex-1">
|
||||
<h2 class="text-xl font-bold mb-2">{{ user.username }}</h2>
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<p class="text-gray-500">OpenID</p>
|
||||
<p>{{ user.open_id }}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-gray-500">状态</p>
|
||||
<Badge :value="user.status === 0 ? '活跃' : '禁用'"
|
||||
:severity="user.status === 0 ? 'success' : 'danger'" />
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-gray-500">创建时间</p>
|
||||
<p>{{ formatDate(user.created_at) }}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-gray-500">更新时间</p>
|
||||
<p>{{ formatDate(user.updated_at) }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 用户购买的文章列表 -->
|
||||
<div class="card">
|
||||
<h3 class="text-xl font-semibold mb-4">购买的文章</h3>
|
||||
<DataTable :value="userArticles" stripedRows class="p-datatable-sm" responsiveLayout="scroll"
|
||||
:lazy="true" :totalRecords="totalArticles" :rows="lazyParams.limit" :loading="loading"
|
||||
@page="onPage" paginator :rows-per-page-options="[10, 20, 50]">
|
||||
<Column field="title" header="标题"></Column>
|
||||
<Column field="price" header="价格"></Column>
|
||||
<Column field="bought_at" header="购买时间">
|
||||
<template #body="{ data }">
|
||||
{{ formatDate(data.bought_at) }}
|
||||
</template>
|
||||
</Column>
|
||||
</DataTable>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -140,7 +140,10 @@ onMounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="font-bold">{{ data.username }}</div>
|
||||
<router-link :to="`/users/${data.id}`"
|
||||
class="font-bold text-blue-600 hover:text-blue-800">
|
||||
{{ data.username }}
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -41,6 +41,12 @@ const routes = [
|
||||
name: 'Users',
|
||||
component: () => import('./pages/UserPage.vue'),
|
||||
},
|
||||
{
|
||||
path: '/users/:id',
|
||||
name: 'UserDetail',
|
||||
component: () => import('./pages/UserDetail.vue'),
|
||||
props: true
|
||||
},
|
||||
{
|
||||
path: '/orders',
|
||||
name: 'Orders',
|
||||
|
||||
Reference in New Issue
Block a user