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

Revert "fix(ledger): 分享收益筛选支持多类型（REWARD_TO_SETTLEABLE + REWARD_PENDING）" 

This reverts commit d223671db7.
This commit is contained in:
hailin 2026-03-01 11:07:19 -08:00
parent d223671db7
commit fda79304c6
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/services/wallet-service/src/infrastructure/persistence/repositories/ledger-entry.repository.impl.ts
View File

@ -73,9 +73,8 @@ export class LedgerEntryRepositoryImpl implements ILedgerEntryRepository {
};
if (filters?.entryType) {
// 支持逗号分隔的多类型筛选（如 REWARD_TO_SETTLEABLE,REWARD_PENDING）
const types = filters.entryType.split(',').map(t => t.trim()).filter(Boolean);
where.entryType = types.length === 1 ? types[0] : { in: types };
// 如果用户指定了类型筛选，则使用用户指定的类型
where.entryType = filters.entryType;
}
if (filters?.assetType) {
where.assetType = filters.assetType;
@ -141,9 +140,8 @@ export class LedgerEntryRepositoryImpl implements ILedgerEntryRepository {
};
if (filters?.entryType) {
// 支持逗号分隔的多类型筛选（如 REWARD_TO_SETTLEABLE,REWARD_PENDING）
const types = filters.entryType.split(',').map(t => t.trim()).filter(Boolean);
where.entryType = types.length === 1 ? types[0] : { in: types };
// 如果用户指定了类型筛选，则使用用户指定的类型
where.entryType = filters.entryType;
}
if (filters?.assetType) {
where.assetType = filters.assetType;

2
frontend/mobile-app/lib/features/trading/presentation/pages/ledger_detail_page.dart
View File

@ -46,7 +46,7 @@ class _LedgerDetailPageState extends ConsumerState<LedgerDetailPage>
{'value': 'TRANSFER_IN', 'label': '转入'},
{'value': 'TRANSFER_OUT', 'label': '转出'},
{'value': 'PLANT_PAYMENT', 'label': '认种支付'},
{'value': 'REWARD_TO_SETTLEABLE,REWARD_PENDING', 'label': '分享收益'},
{'value': 'REWARD_TO_SETTLEABLE', 'label': '分享收益'},
{'value': 'SYSTEM_ALLOCATION', 'label': '权益收入'},
{'value': 'REWARD_EXPIRED', 'label': '奖励过期'},
{'value': 'WITHDRAWAL', 'label': '提现'},