diff --git a/backend/services/contribution-service/src/application/application.module.ts b/backend/services/contribution-service/src/application/application.module.ts index e375374d..ebf7c783 100644 --- a/backend/services/contribution-service/src/application/application.module.ts +++ b/backend/services/contribution-service/src/application/application.module.ts @@ -19,6 +19,7 @@ import { SnapshotService } from './services/snapshot.service'; import { GetContributionAccountQuery } from './queries/get-contribution-account.query'; import { GetContributionStatsQuery } from './queries/get-contribution-stats.query'; import { GetContributionRankingQuery } from './queries/get-contribution-ranking.query'; +import { GetPlantingLedgerQuery } from './queries/get-planting-ledger.query'; // Schedulers import { ContributionScheduler } from './schedulers/contribution.scheduler'; @@ -46,6 +47,7 @@ import { ContributionScheduler } from './schedulers/contribution.scheduler'; GetContributionAccountQuery, GetContributionStatsQuery, GetContributionRankingQuery, + GetPlantingLedgerQuery, // Schedulers ContributionScheduler, @@ -57,6 +59,7 @@ import { ContributionScheduler } from './schedulers/contribution.scheduler'; GetContributionAccountQuery, GetContributionStatsQuery, GetContributionRankingQuery, + GetPlantingLedgerQuery, ], }) export class ApplicationModule {} diff --git a/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts b/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts index f28e6a2f..50b225d6 100644 --- a/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts +++ b/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts @@ -32,6 +32,8 @@ export class DashboardController { adoptedUsers: raw.users?.adopted || 0, networkEffectiveContribution: raw.contribution?.effectiveContribution || '0', networkTotalContribution: raw.contribution?.totalContribution || '0', + networkPendingContribution: raw.contribution?.teamLevelContribution || '0', + networkBonusPendingContribution: raw.contribution?.teamBonusContribution || '0', totalDistributed: raw.mining?.totalMined || '0', totalBurned: raw.mining?.latestDailyStat?.totalBurned || '0', circulationPool: raw.trading?.circulationPool?.totalShares || '0', diff --git a/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx b/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx index f9eae8b8..11cc8bec 100644 --- a/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx +++ b/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx @@ -54,8 +54,15 @@ export function PriceOverview() {

{formatCompactNumber(stats?.networkEffectiveContribution)}

-

总算力

-

{formatCompactNumber(stats?.networkTotalContribution)}

+

待解锁

+

+ {formatCompactNumber( + String( + Number(stats?.networkPendingContribution || 0) + + Number(stats?.networkBonusPendingContribution || 0) + ) + )} +

认种用户

diff --git a/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx b/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx index dbc012d7..bbd7a6cc 100644 --- a/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx +++ b/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx @@ -48,7 +48,12 @@ export function StatsCards() { { title: '全网算力', value: formatCompactNumber(stats?.networkEffectiveContribution), - subValue: `总算力: ${formatCompactNumber(stats?.networkTotalContribution)}`, + subValue: `待解锁: ${formatCompactNumber( + String( + Number(stats?.networkPendingContribution || 0) + + Number(stats?.networkBonusPendingContribution || 0) + ) + )}`, icon: Activity, iconColor: 'text-blue-500', }, diff --git a/frontend/mining-admin-web/src/types/dashboard.ts b/frontend/mining-admin-web/src/types/dashboard.ts index fe0f2ee5..ffbd1bd4 100644 --- a/frontend/mining-admin-web/src/types/dashboard.ts +++ b/frontend/mining-admin-web/src/types/dashboard.ts @@ -3,6 +3,8 @@ export interface DashboardStats { adoptedUsers: number; networkEffectiveContribution: string; networkTotalContribution: string; + networkPendingContribution: string; + networkBonusPendingContribution: string; totalDistributed: string; totalBurned: string; circulationPool: string; diff --git a/frontend/mining-app/lib/core/network/api_endpoints.dart b/frontend/mining-app/lib/core/network/api_endpoints.dart index 99ec77e2..34a68cbf 100644 --- a/frontend/mining-app/lib/core/network/api_endpoints.dart +++ b/frontend/mining-app/lib/core/network/api_endpoints.dart @@ -56,7 +56,7 @@ class ApiEndpoints { static String contributionRecords(String accountSequence) => '/api/v2/contribution/accounts/$accountSequence/records'; - // User Service 2.0 (Kong路由: /api/v2/users) + // Planting Ledger (Kong路由: /api/v2/contribution) static String plantingLedger(String accountSequence) => - '/api/v2/users/$accountSequence/planting-ledger'; + '/api/v2/contribution/accounts/$accountSequence/planting-ledger'; }