hailin
/
rwadurian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(mining-admin): add totalTrees, separate level/bonus pending display 

- Add totalTrees field from syncedAdoption aggregate
- Rename fields: networkLevelPending, networkBonusPending
- Stats card: show level pending and bonus pending separately
- Add new stats card for total trees count
- Price overview: 2-row layout showing all contribution metrics

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
hailin 2026-01-14 23:59:32 -08:00
parent b310fde426
commit 12f8fa67fc
5 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts
View File

@ -30,10 +30,11 @@ export class DashboardController {
return {
totalUsers: raw.users?.total || 0,
adoptedUsers: raw.users?.adopted || 0,
totalTrees: raw.contribution?.totalTrees || 0,
networkEffectiveContribution: raw.contribution?.effectiveContribution || '0',
networkTotalContribution: raw.contribution?.totalContribution || '0',
networkPendingContribution: raw.contribution?.teamLevelContribution || '0',
networkBonusPendingContribution: raw.contribution?.teamBonusContribution || '0',
networkLevelPending: raw.contribution?.teamLevelContribution || '0',
networkBonusPending: raw.contribution?.teamBonusContribution || '0',
totalDistributed: raw.mining?.totalMined || '0',
totalBurned: raw.mining?.latestDailyStat?.totalBurned || '0',
circulationPool: raw.trading?.circulationPool?.totalShares || '0',

34
backend/services/mining-admin-service/src/application/services/dashboard.service.ts
View File

@ -112,22 +112,26 @@ export class DashboardService {
* 获取算力统计
*/
private async getContributionStats() {
const accounts = await this.prisma.syncedContributionAccount.aggregate({
_sum: {
totalContribution: true,
effectiveContribution: true,
personalContribution: true,
teamLevelContribution: true,
teamBonusContribution: true,
},
_count: true,
});
const systemContributions =
await this.prisma.syncedSystemContribution.aggregate({
const [accounts, systemContributions, adoptionStats] = await Promise.all([
this.prisma.syncedContributionAccount.aggregate({
_sum: {
totalContribution: true,
effectiveContribution: true,
personalContribution: true,
teamLevelContribution: true,
teamBonusContribution: true,
},
_count: true,
}),
this.prisma.syncedSystemContribution.aggregate({
_sum: { contributionBalance: true },
_count: true,
});
}),
this.prisma.syncedAdoption.aggregate({
_sum: { treeCount: true },
_count: true,
}),
]);
return {
totalAccounts: accounts._count,
@ -143,6 +147,8 @@ export class DashboardService {
systemAccounts: systemContributions._count,
systemContribution:
systemContributions._sum.contributionBalance?.toString() || '0',
totalAdoptions: adoptionStats._count,
totalTrees: adoptionStats._sum.treeCount || 0,
};
}

31
frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx
View File

@ -44,30 +44,33 @@ export function PriceOverview() {
</div>
<div className="mt-6 pt-6 border-t">
<div className="grid grid-cols-4 gap-4 text-center">
<div>
<p className="text-xs text-muted-foreground">流通池</p>
<p className="text-sm font-medium">{formatCompactNumber(stats?.circulationPool)}</p>
</div>
<div className="grid grid-cols-3 gap-4 text-center">
<div>
<p className="text-xs text-muted-foreground">有效算力</p>
<p className="text-sm font-medium">{formatCompactNumber(stats?.networkEffectiveContribution)}</p>
</div>
<div>
<p className="text-xs text-muted-foreground">待解锁</p>
<p className="text-sm font-medium">
{formatCompactNumber(
String(
Number(stats?.networkPendingContribution || 0) +
Number(stats?.networkBonusPendingContribution || 0)
)
)}
</p>
<p className="text-xs text-muted-foreground">层级待解锁</p>
<p className="text-sm font-medium">{formatCompactNumber(stats?.networkLevelPending)}</p>
</div>
<div>
<p className="text-xs text-muted-foreground">团队待解锁</p>
<p className="text-sm font-medium">{formatCompactNumber(stats?.networkBonusPending)}</p>
</div>
</div>
<div className="grid grid-cols-3 gap-4 text-center mt-4">
<div>
<p className="text-xs text-muted-foreground">认种树总数</p>
<p className="text-sm font-medium">{stats?.totalTrees?.toLocaleString() ?? '-'}</p>
</div>
<div>
<p className="text-xs text-muted-foreground">认种用户</p>
<p className="text-sm font-medium">{stats?.adoptedUsers?.toLocaleString() ?? '-'}</p>
</div>
<div>
<p className="text-xs text-muted-foreground">流通池</p>
<p className="text-sm font-medium">{formatCompactNumber(stats?.circulationPool)}</p>
</div>
</div>
</div>
</CardContent>

13
frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx
View File

@ -48,15 +48,16 @@ export function StatsCards() {
{
title: '全网算力',
value: formatCompactNumber(stats?.networkEffectiveContribution),
subValue: `待解锁: ${formatCompactNumber(
String(
Number(stats?.networkPendingContribution || 0) +
Number(stats?.networkBonusPendingContribution || 0)
)
)}`,
subValue: `层级待解锁: ${formatCompactNumber(stats?.networkLevelPending)} | 团队待解锁: ${formatCompactNumber(stats?.networkBonusPending)}`,
icon: Activity,
iconColor: 'text-blue-500',
},
{
title: '认种树总数',
value: formatNumber(stats?.totalTrees),
icon: Activity,
iconColor: 'text-emerald-500',
},
{
title: '已分配积分股',
value: formatCompactNumber(stats?.totalDistributed),

5
frontend/mining-admin-web/src/types/dashboard.ts
View File

@ -1,10 +1,11 @@
export interface DashboardStats {
totalUsers: number;
adoptedUsers: number;
totalTrees: number;
networkEffectiveContribution: string;
networkTotalContribution: string;
networkPendingContribution: string;
networkBonusPendingContribution: string;
networkLevelPending: string;
networkBonusPending: string;
totalDistributed: string;
totalBurned: string;
circulationPool: string;