qzl/eryao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(points): 实现积分流水列表功能

Browse Source 
- 后端新增 GET /api/v1/points/ledger 接口
- 前端新增积分流水列表页面
- 积分中心添加「查看流水」入口
- 重命名 AccountDeleteScreen 为 AccountDataScreen
- 流水列表支持分页加载和空状态展示
This commit is contained in:
ZL-Q
2026-04-28 17:19:08 +08:00
parent a83001de0d
commit 940c67e642
12 changed files with 794 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/lib/features/points/data/apis/points_api.dart
+16
View File
@@ -1,5 +1,6 @@
import 'package:dio/dio.dart';
import '../models/ledger_item.dart';
import '../models/package_info.dart';
class PointsApi {
@@ -11,4 +12,19 @@ class PointsApi {
final response = await _dio.get('/api/v1/points/packages');
return PackagesResult.fromJson(response.data as Map<String, dynamic>);
}
Future<LedgerListResult> getLedger({
int limit = 20,
String? cursor,
}) async {
final query = <String, dynamic>{'limit': limit};
if (cursor != null) {
query['cursor'] = cursor;
}
final response = await _dio.get(
'/api/v1/points/ledger',
queryParameters: query,
);
return LedgerListResult.fromJson(response.data as Map<String, dynamic>);
}
}
apps/lib/features/points/data/models/ledger_item.dart
+50
View File
@@ -0,0 +1,50 @@
class LedgerItem {
const LedgerItem({
required this.id,
required this.direction,
required this.amount,
required this.balanceAfter,
required this.changeType,
required this.createdAt,
});
final String id;
final int direction;
final int amount;
final int balanceAfter;
final String changeType;
final String createdAt;
factory LedgerItem.fromJson(Map<String, dynamic> json) {
return LedgerItem(
id: json['id'] as String,
direction: json['direction'] as int,
amount: json['amount'] as int,
balanceAfter: json['balanceAfter'] as int,
changeType: json['changeType'] as String,
createdAt: json['createdAt'] as String,
);
}
}
class LedgerListResult {
const LedgerListResult({
required this.items,
this.nextCursor,
required this.hasMore,
});
final List<LedgerItem> items;
final String? nextCursor;
final bool hasMore;
factory LedgerListResult.fromJson(Map<String, dynamic> json) {
return LedgerListResult(
items: (json['items'] as List<dynamic>)
.map((e) => LedgerItem.fromJson(e as Map<String, dynamic>))
.toList(),
nextCursor: json['nextCursor'] as String?,
hasMore: json['hasMore'] as bool,
);
}
}
apps/lib/features/points/presentation/screens/points_ledger_screen.dart
+346
View File
@@ -0,0 +1,346 @@
import 'package:flutter/material.dart';
import '../../../../app/di/injection.dart';
import '../../../../core/auth/session_store.dart';
import '../../../../core/logging/logger.dart';
import '../../../../data/network/api_client.dart';
import '../../../../data/storage/local_kv_store.dart';
import '../../../../l10n/app_localizations.dart';
import '../../../../shared/theme/app_color_palette.dart';
import '../../../../shared/theme/design_tokens.dart';
import '../../../../shared/utils/time_format.dart';
import '../../../../shared/widgets/app_loading_indicator.dart';
import '../../data/apis/points_api.dart';
import '../../data/models/ledger_item.dart';
class PointsLedgerScreen extends StatefulWidget {
const PointsLedgerScreen({super.key});
@override
State<PointsLedgerScreen> createState() => _PointsLedgerScreenState();
}
class _PointsLedgerScreenState extends State<PointsLedgerScreen> {
final Logger _logger = getLogger('features.points.ledger_screen');
late final ScrollController _scrollController;
late final PointsApi _api;
final List<LedgerItem> _items = [];
String? _nextCursor;
bool _hasMore = false;
bool _isLoading = false;
bool _isLoadingMore = false;
Object? _error;
@override
void initState() {
super.initState();
_scrollController = ScrollController()..addListener(_onScroll);
final sessionStore = SessionStore(LocalKvStore());
final apiClient = ApiClient(
baseUrl: appDependencies.backendUrl,
tokenProvider: sessionStore.getToken,
);
_api = PointsApi(apiClient.rawDio);
_loadInitial();
}
@override
void dispose() {
_scrollController.removeListener(_onScroll);
_scrollController.dispose();
super.dispose();
}
void _onScroll() {
if (!_scrollController.hasClients) return;
final position = _scrollController.position;
if (position.pixels >= position.maxScrollExtent - 240) {
_loadMore();
}
}
Future<void> _loadInitial() async {
if (_isLoading) return;
setState(() {
_isLoading = true;
_error = null;
});
try {
final result = await _api.getLedger();
if (mounted) {
setState(() {
_items.clear();
_items.addAll(result.items);
_nextCursor = result.nextCursor;
_hasMore = result.hasMore;
_isLoading = false;
});
}
} catch (e, stackTrace) {
_logger.error(
message: 'Failed to load ledger',
error: e,
stackTrace: stackTrace,
);
if (mounted) {
setState(() {
_error = e;
_isLoading = false;
});
}
}
}
Future<void> _loadMore() async {
if (_isLoadingMore || !_hasMore || _nextCursor == null) return;
setState(() {
_isLoadingMore = true;
});
try {
final result = await _api.getLedger(cursor: _nextCursor);
if (mounted) {
setState(() {
_items.addAll(result.items);
_nextCursor = result.nextCursor;
_hasMore = result.hasMore;
_isLoadingMore = false;
});
}
} catch (e, stackTrace) {
_logger.error(
message: 'Failed to load more ledger items',
error: e,
stackTrace: stackTrace,
);
if (mounted) {
setState(() {
_isLoadingMore = false;
});
}
}
}
String _getDisplayText(AppLocalizations l10n, String changeType) {
return switch (changeType) {
'register' => l10n.pointsLedgerTypeRegister,
'purchase' => l10n.pointsLedgerTypePurchase,
'consume' => l10n.pointsLedgerTypeConsume,
'adjust' => l10n.pointsLedgerTypeAdjust,
'refund' => l10n.pointsLedgerTypeRefund,
_ => changeType,
};
}
IconData _getIcon(String changeType) {
return switch (changeType) {
'register' => Icons.card_giftcard_rounded,
'purchase' => Icons.shopping_bag_rounded,
'consume' => Icons.chat_bubble_outline_rounded,
'adjust' => Icons.tune_rounded,
'refund' => Icons.replay_rounded,
_ => Icons.swap_vert_rounded,
};
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final colors = Theme.of(context).colorScheme;
final palette = Theme.of(context).extension<AppColorPalette>()!;
return Scaffold(
backgroundColor: colors.surfaceContainerLow,
appBar: AppBar(
title: Text(l10n.pointsLedgerTitle),
centerTitle: true,
backgroundColor: colors.surfaceContainerLow,
surfaceTintColor: colors.surfaceContainerLow,
),
body: _buildBody(l10n, colors, palette),
);
}
Widget _buildBody(
AppLocalizations l10n,
ColorScheme colors,
AppColorPalette palette,
) {
if (_isLoading) {
return const Center(child: AppLoadingIndicator());
}
if (_error != null && _items.isEmpty) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.error_outline, size: 48, color: colors.error),
const SizedBox(height: AppSpacing.md),
Text(
l10n.errorRequestGeneric,
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: AppSpacing.lg),
FilledButton(onPressed: _loadInitial, child: Text(l10n.retry)),
],
),
);
}
if (_items.isEmpty) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.receipt_long_outlined,
size: 64,
color: colors.onSurfaceVariant.withValues(alpha: 0.5),
),
const SizedBox(height: AppSpacing.md),
Text(
l10n.pointsLedgerEmpty,
style: Theme.of(
context,
).textTheme.bodyMedium?.copyWith(color: colors.onSurfaceVariant),
),
],
),
);
}
return ListView.builder(
controller: _scrollController,
padding: const EdgeInsets.all(AppSpacing.lg),
itemCount: _items.length + (_hasMore ? 1 : 0),
itemBuilder: (context, index) {
if (index == _items.length) {
if (_isLoadingMore) {
return const Padding(
padding: EdgeInsets.all(AppSpacing.lg),
child: Center(child: AppLoadingIndicator()),
);
}
return const SizedBox.shrink();
}
final item = _items[index];
final isIncome = item.direction == 1;
final amountText = isIncome ? '+${item.amount}' : '-${item.amount}';
return _LedgerItemCard(
icon: _getIcon(item.changeType),
displayText: _getDisplayText(l10n, item.changeType),
amountText: amountText,
isIncome: isIncome,
balanceAfter: item.balanceAfter,
balanceText: l10n.pointsLedgerBalance(item.balanceAfter),
dateTime: formatCompactLocalDateTime(item.createdAt),
colors: colors,
palette: palette,
);
},
);
}
}
class _LedgerItemCard extends StatelessWidget {
const _LedgerItemCard({
required this.icon,
required this.displayText,
required this.amountText,
required this.isIncome,
required this.balanceAfter,
required this.balanceText,
required this.dateTime,
required this.colors,
required this.palette,
});
final IconData icon;
final String displayText;
final String amountText;
final bool isIncome;
final int balanceAfter;
final String balanceText;
final String dateTime;
final ColorScheme colors;
final AppColorPalette palette;
@override
Widget build(BuildContext context) {
return Container(
margin: const EdgeInsets.only(bottom: AppSpacing.sm),
padding: const EdgeInsets.all(AppSpacing.md),
decoration: BoxDecoration(
color: colors.surface,
borderRadius: BorderRadius.circular(AppRadius.lg),
border: Border.all(color: colors.outlineVariant),
),
child: Row(
children: [
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: isIncome
? palette.incomeGreenBg.withValues(alpha: 0.15)
: colors.errorContainer.withValues(alpha: 0.5),
borderRadius: BorderRadius.circular(AppRadius.md),
),
child: Icon(
icon,
size: 22,
color: isIncome ? palette.incomeGreenText : colors.error,
),
),
const SizedBox(width: AppSpacing.md),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
displayText,
style: Theme.of(
context,
).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
),
const SizedBox(height: 2),
Text(
dateTime,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colors.onSurfaceVariant,
),
),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
amountText,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
color: isIncome ? palette.incomeGreenText : colors.error,
),
),
const SizedBox(height: 2),
Text(
balanceText,
style: Theme.of(
context,
).textTheme.bodySmall?.copyWith(color: colors.onSurfaceVariant),
),
],
),
],
),
);
}
}
apps/lib/features/settings/presentation/screens/account_delete_screen.dart → apps/lib/features/settings/presentation/screens/account_data_screen.dart
+33 -17
View File
@@ -9,19 +9,20 @@ import '../../../../l10n/app_localizations.dart';
import '../../../../shared/theme/design_tokens.dart';
import '../../../../shared/widgets/toast/toast.dart';
import '../../../../shared/widgets/toast/toast_type.dart';
import '../../../points/presentation/screens/points_ledger_screen.dart';
import '../widgets/settings_section_widgets.dart';
class AccountDeleteScreen extends StatefulWidget {
const AccountDeleteScreen({super.key, required this.onDeleteAccount});
class AccountDataScreen extends StatefulWidget {
const AccountDataScreen({super.key, required this.onDeleteAccount});
final Future<void> Function() onDeleteAccount;
@override
State<AccountDeleteScreen> createState() => _AccountDeleteScreenState();
State<AccountDataScreen> createState() => _AccountDataScreenState();
}
class _AccountDeleteScreenState extends State<AccountDeleteScreen> {
final Logger _logger = getLogger('features.settings.account_delete');
class _AccountDataScreenState extends State<AccountDataScreen> {
final Logger _logger = getLogger('features.settings.account_data');
bool _isDeleting = false;
@override
@@ -42,6 +43,13 @@ class _AccountDeleteScreenState extends State<AccountDeleteScreen> {
children: [
SettingsGroupCard(
children: [
SettingsMenuTile(
icon: Icons.receipt_long_rounded,
title: l10n.pointsLedgerTitle,
tint: colors.primary,
background: colors.surfaceContainerHighest,
onTap: _openPointsLedger,
),
SettingsMenuTile(
icon: Icons.delete_outline_rounded,
title: l10n.settingsDeleteAccountTitle,
@@ -58,6 +66,14 @@ class _AccountDeleteScreenState extends State<AccountDeleteScreen> {
);
}
Future<void> _openPointsLedger() async {
await Navigator.of(context).push<void>(
MaterialPageRoute<void>(
builder: (_) => const PointsLedgerScreen(),
),
);
}
Future<void> _confirmDelete() async {
final confirmed = await showDialog<bool>(
context: context,
@@ -194,8 +210,8 @@ class _DeleteConfirmDialogState extends State<_DeleteConfirmDialog> {
child: Text(
l10n.settingsDeleteAccountDialogTitle,
style: Theme.of(context).textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w700,
),
fontWeight: FontWeight.w700,
),
),
),
],
@@ -204,9 +220,9 @@ class _DeleteConfirmDialogState extends State<_DeleteConfirmDialog> {
Text(
l10n.settingsDeleteAccountWarningBody,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colors.onSurfaceVariant,
height: 1.45,
),
color: colors.onSurfaceVariant,
height: 1.45,
),
),
const SizedBox(height: AppSpacing.sm),
Container(
@@ -220,10 +236,10 @@ class _DeleteConfirmDialogState extends State<_DeleteConfirmDialog> {
child: Text(
l10n.settingsDeleteAccountReRegisterNotice,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colors.onErrorContainer,
fontWeight: FontWeight.w700,
height: 1.35,
),
color: colors.onErrorContainer,
fontWeight: FontWeight.w700,
height: 1.35,
),
),
),
const SizedBox(height: AppSpacing.md),
@@ -232,9 +248,9 @@ class _DeleteConfirmDialogState extends State<_DeleteConfirmDialog> {
? l10n.settingsDeleteAccountWaitAction(_secondsLeft)
: l10n.settingsDeleteAccountDialogBody,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colors.error,
fontWeight: FontWeight.w600,
),
color: colors.error,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: AppSpacing.lg),
Row(
apps/lib/features/settings/presentation/screens/coin_center_screen.dart
+32 -2
View File
@@ -90,6 +90,32 @@ class _CoinCenterScreenState extends State<CoinCenterScreen> {
}
}
Future<void> _reloadPackages() async {
try {
final sessionStore = SessionStore(LocalKvStore());
final apiClient = ApiClient(
baseUrl: appDependencies.backendUrl,
tokenProvider: sessionStore.getToken,
);
final api = PointsApi(apiClient.rawDio);
final result = await api.getPackages();
await _iapService?.loadStoreKitProducts(result.packages);
if (mounted) {
setState(() {
_packages = result.packages;
});
}
} catch (e, stackTrace) {
_logger.warning(
message: 'Failed to reload packages after purchase',
extra: {'error': e.toString()},
);
}
}
void _onPurchaseStateChanged() {
final service = _iapService;
if (service == null || !mounted) return;
@@ -100,6 +126,7 @@ class _CoinCenterScreenState extends State<CoinCenterScreen> {
case PurchaseFlowState.success:
Toast.show(context, l10n.paymentSuccess, type: ToastType.success);
_refreshBalance();
_reloadPackages();
service.resetState();
break;
case PurchaseFlowState.failed:
@@ -265,7 +292,7 @@ class _CoinCenterScreenState extends State<CoinCenterScreen> {
if (product != null) {
return product.price;
}
return pkg.priceDisplay;
return '';
}
Future<void> _handlePurchase(PackageInfo pkg) async {
@@ -284,6 +311,9 @@ class _CoinCenterScreenState extends State<CoinCenterScreen> {
}
String? _getPackageBadge(PackageInfo pkg, AppLocalizations l10n) {
if (pkg.productCode == ProductCode.newUserPack) {
return l10n.settingsCoinPackNewUserBadge;
}
if (pkg.productCode == ProductCode.popularPack) {
return l10n.settingsCoinPackPopularBadge;
}
@@ -293,7 +323,7 @@ class _CoinCenterScreenState extends State<CoinCenterScreen> {
String _getPackageTitle(PackageInfo pkg, AppLocalizations l10n) {
return switch (pkg.productCode) {
ProductCode.newUserPack => l10n.settingsCoinPackStarter,
ProductCode.basicPack => l10n.settingsCoinPackBasic,
ProductCode.starterPack => l10n.settingsCoinPackBasic,
ProductCode.popularPack => l10n.settingsCoinPackPopular,
ProductCode.premiumPack => l10n.settingsCoinPackPremium,
};
apps/lib/features/settings/presentation/screens/settings_screen.dart
+23 -14
View File
@@ -9,7 +9,7 @@ import '../../data/models/profile_settings.dart';
import '../../data/repositories/invite_repository.dart';
import '../models/legal_document_type.dart';
import '../utils/legal_document_assets.dart';
import 'account_delete_screen.dart';
import 'account_data_screen.dart';
import '../widgets/settings_section_widgets.dart';
import 'coin_center_screen.dart';
import 'feedback_screen.dart';
@@ -18,6 +18,9 @@ import 'invite_screen.dart';
import 'legal_document_screen.dart';
import 'profile_edit_screen.dart';
// 临时标志位：我的邀请逻辑施工完毕后删除此标志位，并恢复入口与子页面访问。
final bool _showInviteEntry = false;
class SettingsScreen extends StatefulWidget {
const SettingsScreen({
super.key,
@@ -48,7 +51,7 @@ class SettingsScreen extends StatefulWidget {
final Future<void> Function() onLogout;
final Future<void> Function() onDeleteAccount;
final Future<ProfileSettingsV1> Function(ProfileSettingsV1 updated)
onSaveProfile;
onSaveProfile;
final void Function(int newBalance) onBalanceChanged;
@override
@@ -118,13 +121,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
background: colors.surfaceContainerHighest,
onTap: _openGeneralSettings,
),
SettingsMenuTile(
icon: Icons.card_giftcard_rounded,
title: l10n.settingsInviteTitle,
tint: colors.primary,
background: colors.surfaceContainerHighest,
onTap: _openInvite,
),
if (_showInviteEntry)
SettingsMenuTile(
icon: Icons.card_giftcard_rounded,
title: l10n.settingsInviteTitle,
tint: colors.primary,
background: colors.surfaceContainerHighest,
onTap: _openInvite,
),
SettingsMenuTile(
icon: Icons.feedback_outlined,
title: l10n.settingsFeedbackTitle,
@@ -142,7 +146,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
tint: colors.primary,
background: colors.surfaceContainerHighest,
showDivider: false,
onTap: _openAccountDelete,
onTap: _openAccountData,
),
],
),
@@ -161,7 +165,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: l10n.privacyPolicy,
tint: colors.secondary,
background: colors.surfaceContainerHighest,
onTap: () => _openLegalDocument(LegalDocumentType.privacyPolicy),
onTap: () =>
_openLegalDocument(LegalDocumentType.privacyPolicy),
),
SettingsMenuTile(
icon: Icons.description_outlined,
@@ -169,7 +174,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
tint: colors.secondary,
background: colors.surfaceContainerHighest,
showDivider: false,
onTap: () => _openLegalDocument(LegalDocumentType.termsOfService),
onTap: () =>
_openLegalDocument(LegalDocumentType.termsOfService),
),
],
),
@@ -222,6 +228,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
}
Future<void> _openInvite() async {
if (!_showInviteEntry) {
return;
}
await Navigator.of(context).push<void>(
MaterialPageRoute<void>(
builder: (_) => InviteScreen(inviteRepository: widget.inviteRepository),
@@ -261,11 +270,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
Future<void> _openAccountDelete() async {
Future<void> _openAccountData() async {
final deleted = await Navigator.of(context).push<bool>(
MaterialPageRoute<bool>(
builder: (_) =>
AccountDeleteScreen(onDeleteAccount: widget.onDeleteAccount),
AccountDataScreen(onDeleteAccount: widget.onDeleteAccount),
),
);
if (deleted != true) {
apps/lib/features/settings/presentation/widgets/settings_section_widgets.dart
+68
View File
@@ -445,6 +445,74 @@ class CoinPackageCard extends StatelessWidget {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppRadius.xl),
),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.lg),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: AppSpacing.xs),
Text(
l10n.settingsCoinAmount(amount),
style: Theme.of(context).textTheme.bodyMedium,
),
],
),
),
if (badge != null)
Container(
padding: const EdgeInsets.symmetric(
horizontal: AppSpacing.sm,
vertical: AppSpacing.xs,
),
decoration: BoxDecoration(
color: palette.historyGoldBg,
borderRadius: BorderRadius.circular(AppRadius.full),
),
child: Text(
badge!,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: palette.historyGoldText,
fontWeight: FontWeight.w700,
),
),
),
],
),
const SizedBox(height: AppSpacing.lg),
if (!isAvailable && unavailableMessage != null)
Text(
unavailableMessage!,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colors.error,
),
)
else
Row(
children: [
Text(
price,
style: Theme.of(
context,
).textTheme.headlineMedium?.copyWith(color: colors.primary),
),
const Spacer(),
FilledButton(
onPressed: isPurchasing || !isAvailable ? null : onPurchase,
style: FilledButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppRadius.full),
),
),
child: Padding(
padding: const EdgeInsets.all(AppSpacing.lg),
child: Column(