diff --git a/backend/services/planting-service/src/pre-planting/api/controllers/internal-pre-planting.controller.ts b/backend/services/planting-service/src/pre-planting/api/controllers/internal-pre-planting.controller.ts index f28fdc4e..d97a25d6 100644 --- a/backend/services/planting-service/src/pre-planting/api/controllers/internal-pre-planting.controller.ts +++ b/backend/services/planting-service/src/pre-planting/api/controllers/internal-pre-planting.controller.ts @@ -244,6 +244,7 @@ export class InternalPrePlantingController { treesMergedAgg, totalUsers, pendingContracts, + pendingPortionsAgg, ] = await Promise.all([ this.prisma.prePlantingOrder.count(), this.prisma.prePlantingOrder.aggregate({ _sum: { portionCount: true } }), @@ -255,6 +256,7 @@ export class InternalPrePlantingController { this.prisma.prePlantingMerge.aggregate({ _sum: { treeCount: true } }), this.prisma.prePlantingPosition.count(), this.prisma.prePlantingMerge.count({ where: { contractStatus: 'PENDING' } }), + this.prisma.prePlantingPosition.aggregate({ _sum: { availablePortions: true } }), ]); return { @@ -265,6 +267,7 @@ export class InternalPrePlantingController { totalTreesMerged: treesMergedAgg._sum.treeCount ?? 0, totalUsers, pendingContracts, + pendingMergePortions: pendingPortionsAgg._sum.availablePortions ?? 0, }; } diff --git a/frontend/admin-web/src/app/(dashboard)/pre-planting/page.tsx b/frontend/admin-web/src/app/(dashboard)/pre-planting/page.tsx index 02a3c966..5b733f90 100644 --- a/frontend/admin-web/src/app/(dashboard)/pre-planting/page.tsx +++ b/frontend/admin-web/src/app/(dashboard)/pre-planting/page.tsx @@ -280,6 +280,12 @@ export default function PrePlantingPage() {
总金额 (绿积分)
+
+
+ {statsLoading ? '-' : formatNumber(stats?.pendingMergePortions ?? 0)} +
+
待合并总量(份)
+
{statsLoading ? '-' : formatNumber(stats?.totalTreesMerged ?? 0)} diff --git a/frontend/admin-web/src/app/(dashboard)/pre-planting/pre-planting.module.scss b/frontend/admin-web/src/app/(dashboard)/pre-planting/pre-planting.module.scss index efa24fd4..7374ff51 100644 --- a/frontend/admin-web/src/app/(dashboard)/pre-planting/pre-planting.module.scss +++ b/frontend/admin-web/src/app/(dashboard)/pre-planting/pre-planting.module.scss @@ -154,7 +154,7 @@ // 统计卡片网格 &__statsGrid { display: grid; - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(5, 1fr); gap: 16px; @media (max-width: 1200px) {