From da2053c5201b450b2504460c2e26c1388d671660 Mon Sep 17 00:00:00 2001 From: YoVinchen Date: Sat, 2 May 2026 17:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flash-sale-frontend/index.html | 2 +- flash-sale-frontend/src/api/flashsale.ts | 10 +- flash-sale-frontend/src/api/modules/admin.ts | 3 + .../src/api/modules/flashsale.ts | 16 ++-- .../src/components/business/FlashSaleCard.vue | 3 +- .../src/components/common/AppFooter.vue | 10 +- .../src/components/common/AppHeader.vue | 24 ++--- .../components/common/NotificationCenter.vue | 8 +- .../src/components/common/SearchComponent.vue | 8 +- .../src/composables/useWebSocket.ts | 8 +- .../src/layouts/AdminLayout.vue | 16 +--- .../src/pages/admin/flashsales.vue | 22 ++--- .../src/pages/admin/groupbuying.vue | 7 +- .../src/pages/admin/monitor.vue | 4 +- .../src/pages/admin/orders.vue | 2 +- flash-sale-frontend/src/pages/admin/users.vue | 15 ++- .../src/pages/flashsale/detail.vue | 19 ++-- .../src/pages/flashsale/index.vue | 16 ++-- flash-sale-frontend/src/pages/home/index.vue | 26 ++--- flash-sale-frontend/src/pages/order/index.vue | 2 +- .../src/pages/user/notifications.vue | 4 +- .../src/pages/user/profile.vue | 2 +- flash-sale-frontend/src/router/guards.ts | 16 ++++ flash-sale-frontend/src/router/index.ts | 6 +- flash-sale-frontend/src/types/api.d.ts | 2 +- .../controller/AdminController.java | 25 +++++ .../GroupBuyingGroupRepository.java | 9 ++ .../GroupBuyingMemberRepository.java | 7 ++ .../repository/NotificationRepository.java | 2 + .../repository/OrderItemRepository.java | 6 ++ .../repository/OrderRepository.java | 9 ++ .../repository/OrderReturnRepository.java | 10 ++ .../repository/ProductReviewRepository.java | 8 ++ .../repository/UserAddressRepository.java | 2 + .../repository/UserFavoriteRepository.java | 2 + .../flashsalesystem/service/AdminService.java | 95 ++++++++++++++++--- .../service/FlashSaleService.java | 8 ++ .../service/GroupBuyingService.java | 63 +++++++++++- 38 files changed, 364 insertions(+), 133 deletions(-) diff --git a/flash-sale-frontend/index.html b/flash-sale-frontend/index.html index f6ba8a2..6646440 100644 --- a/flash-sale-frontend/index.html +++ b/flash-sale-frontend/index.html @@ -6,7 +6,7 @@ 社区生鲜团购系统 - +
diff --git a/flash-sale-frontend/src/api/flashsale.ts b/flash-sale-frontend/src/api/flashsale.ts index 113c31b..87eca95 100644 --- a/flash-sale-frontend/src/api/flashsale.ts +++ b/flash-sale-frontend/src/api/flashsale.ts @@ -2,17 +2,17 @@ import request from './request' import type { FlashSale, FlashSaleParams } from '@/types/flashsale' export const flashSaleApi = { - // 获取秒杀活动列表 + // 获取限时活动列表 getList(params?: FlashSaleParams) { return request.get('/api/flashsales', { params }) }, - // 获取秒杀活动详情 + // 获取限时活动详情 getDetail(id: number) { return request.get(`/api/flashsales/${id}`) }, - // 参与秒杀 + // 参与限时 participate(flashSaleId: number, quantity: number = 1) { return request.post('/api/flashsales/participate', { flashSaleId, @@ -20,12 +20,12 @@ export const flashSaleApi = { }) }, - // 获取正在进行的秒杀活动 + // 获取正在进行的限时活动 getActive() { return request.get('/api/flashsales/active') }, - // 获取即将开始的秒杀活动 + // 获取即将开始的限时活动 getUpcoming() { return request.get('/api/flashsales/upcoming') } diff --git a/flash-sale-frontend/src/api/modules/admin.ts b/flash-sale-frontend/src/api/modules/admin.ts index 1727c87..bf16480 100644 --- a/flash-sale-frontend/src/api/modules/admin.ts +++ b/flash-sale-frontend/src/api/modules/admin.ts @@ -67,6 +67,9 @@ export const adminApi = { }, })) }, + deleteUser(id: number): Promise { + return request.delete(`/api/admin/users/${id}`) + }, getOrders(params: { page: number; size: number; keyword?: string; status?: string | '' }): Promise> { const query = { page: params.page, size: params.size, keyword: params.keyword, status: params.status === '' ? undefined : params.status } return request.get>>('/api/admin/orders', query).then((res) => ({ diff --git a/flash-sale-frontend/src/api/modules/flashsale.ts b/flash-sale-frontend/src/api/modules/flashsale.ts index ff6ef30..8b6a468 100644 --- a/flash-sale-frontend/src/api/modules/flashsale.ts +++ b/flash-sale-frontend/src/api/modules/flashsale.ts @@ -17,12 +17,12 @@ const flashSaleSortField = (sort?: string) => { } export const flashsaleApi = { - // 获取秒杀活动统计信息（即将开始/正在进行/我的参与/抢购成功） + // 获取限时活动统计信息（即将开始/正在进行/我的参与/抢购成功） getStatistics(): Promise> { return request.get('/api/flashsale/statistics') }, - // 获取秒杀活动列表 + // 获取限时活动列表 getList(params?: PageParams & { status?: string }): Promise>> { return request.post>>('/api/flashsale/list', { status: flashSaleStatusToCode(params?.status), @@ -35,8 +35,8 @@ export const flashsaleApi = { data: normalizePage(res.data, normalizeFlashSale), })) }, - - // 获取正在进行的秒杀活动 + + // 获取正在进行的限时活动 getActive(limit?: number): Promise> { return request.get>('/api/flashsale/active').then((res) => ({ ...res, @@ -45,16 +45,16 @@ export const flashsaleApi = { .slice(0, limit ?? Number.MAX_SAFE_INTEGER), })) }, - - // 获取秒杀活动详情 + + // 获取限时活动详情 getDetail(id: number): Promise> { return request.get>(`/api/flashsale/${id}`).then((res) => ({ ...res, data: normalizeFlashSale(res.data), })) }, - - // 参与秒杀 + + // 参与限时 participate(data: { flashSaleId: number; quantity: number; diff --git a/flash-sale-frontend/src/components/business/FlashSaleCard.vue b/flash-sale-frontend/src/components/business/FlashSaleCard.vue index 5daea4a..f32f4b7 100644 --- a/flash-sale-frontend/src/components/business/FlashSaleCard.vue +++ b/flash-sale-frontend/src/components/business/FlashSaleCard.vue @@ -69,7 +69,8 @@ const statusType = computed(() => { const statusText = computed(() => { switch (props.data.status) { case 'UPCOMING': return '即将开始' - case 'ACTIVE': return '秒杀中' + case 'ACTIVE': + return '进行中' case 'ENDED': return '已结束' case 'PAUSED': return '已暂停' default: return '未知' diff --git a/flash-sale-frontend/src/components/common/AppFooter.vue b/flash-sale-frontend/src/components/common/AppFooter.vue index 89c631a..ea6f98f 100644 --- a/flash-sale-frontend/src/components/common/AppFooter.vue +++ b/flash-sale-frontend/src/components/common/AppFooter.vue @@ -6,7 +6,7 @@

关于我们

- 社区生鲜团购系统，支持分布式锁、接口限流、库存预热等核心功能。 + 社区生鲜团购平台，提供商品浏览、拼团下单和订单管理服务。

@@ -20,8 +20,8 @@
  • - - 秒杀活动 + + 拼团活动
  • @@ -51,7 +51,7 @@

    - contact@flashsale.com + service@freshgroup.com

    @@ -62,7 +62,7 @@

    -

    © 2024 社区生鲜团购系统. All rights reserved.

    +

    © 社区生鲜团购平台. All rights reserved.

    diff --git a/flash-sale-frontend/src/components/common/AppHeader.vue b/flash-sale-frontend/src/components/common/AppHeader.vue index 09553d6..214689f 100644 --- a/flash-sale-frontend/src/components/common/AppHeader.vue +++ b/flash-sale-frontend/src/components/common/AppHeader.vue @@ -8,9 +8,6 @@ 社区生鲜团购系统 - - FLASH SALE - @@ -19,10 +16,6 @@ 首页 - - - 秒杀活动 - @@ -57,7 +50,6 @@