修复押金与待解冻资金处理

This commit is contained in:
yml2213
2026-08-28 22:22:26 +08:00
parent f20ff3018f
commit 04dc363320
16 changed files with 97 additions and 23 deletions
@@ -339,7 +339,7 @@ function WorkerAfterSalesItem({
) : null}
{Number(item.pendingDepositDeductionAmount || 0) > 0 ? (
<Typography.Text type="secondary">
押金抵扣 {formatMoney(item.pendingDepositDeductionAmount)}
待解冻资金抵扣 {formatMoney(item.pendingDepositDeductionAmount)}
</Typography.Text>
) : null}
{Number(item.availableDeductionAmount || 0) > 0 ? (
@@ -286,7 +286,7 @@ export function WorkerProfileDesktopAccountDetails({
)}
</Descriptions.Item>
<Descriptions.Item label="免押额度">
{formatMoney(worker.level?.permissions.depositFreeAmount || 0)}
{formatMoney(worker.effectiveDepositFreeAmount)}
</Descriptions.Item>
<Descriptions.Item label="最大同时接单">
{worker.level?.permissions.maxActiveOrders || 0} 单
@@ -359,7 +359,7 @@ function WorkerProfileMobileAccountDetails({
</Tag>,
],
['当前等级', worker.level?.name || '-'],
['免押额度', formatMoney(worker.level?.permissions.depositFreeAmount || 0)],
['免押额度', formatMoney(worker.effectiveDepositFreeAmount)],
['最大同时接单', `${worker.level?.permissions.maxActiveOrders || 0} 单`],
['邀请人', worker.inviter ? worker.inviter.displayName || worker.inviter.username : '-'],
['已完成订单', `${summary?.acceptedOrderCount || 0} 单`],
@@ -33,6 +33,7 @@ const LEDGER_TYPE_OPTIONS = [
{ value: 'deposit_freeze', label: '冻结押金' },
{ value: 'deposit_release', label: '释放押金' },
{ value: 'deposit_pending_unfreeze', label: '待解冻金额' },
{ value: 'reward_pending_unfreeze', label: '报酬待解冻' },
{ value: 'deposit_unfreeze', label: '押金已解冻' },
{ value: 'deposit_deduction', label: '扣除押金' },
{ value: 'reward_settlement', label: '结算报酬' },
@@ -53,7 +53,9 @@ export function formatLedgerType(ledgerType: string) {
deposit_freeze: '冻结押金',
deposit_release: '释放押金',
deposit_pending_unfreeze: '待解冻金额',
reward_pending_unfreeze: '报酬待解冻',
deposit_unfreeze: '押金已解冻',
reward_unfreeze: '报酬已解冻',
deposit_deduction: '扣除押金',
reward_settlement: '结算报酬',
sharing_reward: '拼单报酬',
@@ -73,7 +75,9 @@ export function resolveLedgerTagColor(ledgerType: string) {
if (ledgerType === 'deposit_freeze') return 'gold'
if (ledgerType === 'deposit_release') return 'green'
if (ledgerType === 'deposit_pending_unfreeze') return 'orange'
if (ledgerType === 'reward_pending_unfreeze') return 'orange'
if (ledgerType === 'deposit_unfreeze') return 'green'
if (ledgerType === 'reward_unfreeze') return 'green'
if (ledgerType === 'deposit_deduction') return 'red'
if (ledgerType === 'reward_settlement') return 'cyan'
if (ledgerType === 'sharing_reward') return 'cyan'