parent
424d7379df
commit
8a62fdea39
@ -28,6 +28,7 @@ use Modules\EcommerceFinance\Services\FinanceLedgerFlowEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerFlowSummaryEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerIndependentTransactionColumnEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerIndependentTransactionEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerInternalTransferEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerManualTransactionEditor;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerPayableMappingBulk;
|
||||
use Modules\EcommerceFinance\Services\FinanceLedgerShopDataSynchronizer;
|
||||
@ -1400,6 +1401,84 @@ class FinanceLedger extends Controller
|
||||
], $inserted ? 201 : 200, ['Cache-Control' => 'private, no-store']);
|
||||
}
|
||||
|
||||
public function storeInternalTransfer(
|
||||
Request $request,
|
||||
FinanceLedgerInternalTransferEditor $editor,
|
||||
FinanceLedgerPageData $pageData,
|
||||
): JsonResponse {
|
||||
abort_unless(FinanceLedgerAccess::canEditTransactions(user()), 403, '当前账号没有新增内部转账权限。');
|
||||
|
||||
$openingDate = (string) config('finance_ledger.opening_date', '2026-10-17');
|
||||
$data = $request->validate([
|
||||
'idempotency_key' => ['required', 'uuid'],
|
||||
'txn_date' => ['required', 'date', 'after_or_equal:' . $openingDate],
|
||||
'from_account_short' => ['required', 'string', 'max:100'],
|
||||
'to_account_short' => ['required', 'string', 'max:100', 'different:from_account_short'],
|
||||
'amount' => ['required', 'numeric', 'gt:0', 'max:9999999999999999.99'],
|
||||
]);
|
||||
if (FinanceLedgerIndependentAccounts::contains($data['from_account_short'])
|
||||
|| FinanceLedgerIndependentAccounts::contains($data['to_account_short'])) {
|
||||
throw ValidationException::withMessages([
|
||||
'from_account_short' => '内部转账仅支持财务台账中的正式账户。',
|
||||
]);
|
||||
}
|
||||
|
||||
$result = $editor->create($data);
|
||||
$rows = array_map(
|
||||
fn (object $row): array => $this->internalTransferRow($row),
|
||||
$result['rows'],
|
||||
);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'created' => $result['created'],
|
||||
'approval_no' => $result['approval_no'],
|
||||
'rows' => $rows,
|
||||
'summary' => $pageData->transactionSummary(),
|
||||
'total_transactions' => $pageData->globalTransactionCount(),
|
||||
'next_idempotency_key' => (string) Str::uuid(),
|
||||
], $result['created'] ? 201 : 200, ['Cache-Control' => 'private, no-store']);
|
||||
}
|
||||
|
||||
public function deleteInternalTransfer(
|
||||
int $id,
|
||||
FinanceLedgerInternalTransferEditor $editor,
|
||||
FinanceLedgerPageData $pageData,
|
||||
): JsonResponse {
|
||||
abort_unless(FinanceLedgerAccess::canEditTransactions(user()), 403, '当前账号没有删除内部转账权限。');
|
||||
|
||||
$result = $editor->delete($id);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'deleted' => true,
|
||||
'approval_no' => $result['approval_no'],
|
||||
'summary' => $pageData->transactionSummary(),
|
||||
'total_transactions' => $pageData->globalTransactionCount(),
|
||||
], 200, ['Cache-Control' => 'private, no-store']);
|
||||
}
|
||||
|
||||
/** @return array<string,mixed> */
|
||||
private function internalTransferRow(object $row): array
|
||||
{
|
||||
return [
|
||||
'id' => (int) $row->id,
|
||||
'txn_date' => (string) $row->txn_date,
|
||||
'account_short' => (string) $row->account_short,
|
||||
'counterparty_info' => (string) ($row->counterparty_info ?? ''),
|
||||
'detail' => (string) $row->detail,
|
||||
'source' => FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE,
|
||||
'source_label' => '内部转账',
|
||||
'income' => round((float) $row->income, 2),
|
||||
'expense' => round((float) $row->expense, 2),
|
||||
'balance' => $row->balance === null ? null : round((float) $row->balance, 2),
|
||||
'approval_no' => (string) ($row->approval_no ?? ''),
|
||||
'payment_remark' => (string) ($row->payment_remark ?? ''),
|
||||
'delete_url' => route('business.financial-ledger.transfers.internal.delete', ['id' => $row->id]),
|
||||
'custom_values' => [],
|
||||
];
|
||||
}
|
||||
|
||||
public function editAccount(int $id): JsonResponse
|
||||
{
|
||||
abort_unless(FinanceLedgerAccess::canEditAccountStatus(user()), 403, '只有财务台账管理员可以修改账户。');
|
||||
|
||||
@ -0,0 +1,211 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\EcommerceFinance\Services;
|
||||
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Database\ConnectionInterface;
|
||||
use Illuminate\Database\DatabaseManager;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
class FinanceLedgerInternalTransferEditor
|
||||
{
|
||||
private readonly ConnectionInterface $connection;
|
||||
|
||||
public function __construct(
|
||||
DatabaseManager $databases,
|
||||
private readonly FinanceLedgerCalculator $calculator,
|
||||
) {
|
||||
$this->connection = $databases->connection(
|
||||
(string) config('upstream_mirrors.connection', 'business_mirror'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array{
|
||||
* idempotency_key:string,
|
||||
* txn_date:string,
|
||||
* from_account_short:string,
|
||||
* to_account_short:string,
|
||||
* amount:numeric
|
||||
* } $data
|
||||
* @return array{created:bool,approval_no:string,rows:list<object>}
|
||||
*/
|
||||
public function create(array $data): array
|
||||
{
|
||||
$date = $this->date($data['txn_date'] ?? null);
|
||||
$from = trim((string) ($data['from_account_short'] ?? ''));
|
||||
$to = trim((string) ($data['to_account_short'] ?? ''));
|
||||
$amountCents = $this->cents($data['amount'] ?? 0);
|
||||
if ($from === '' || $to === '') {
|
||||
throw ValidationException::withMessages([
|
||||
'from_account_short' => '请选择转出账户和转入账户。',
|
||||
]);
|
||||
}
|
||||
if ($from === $to) {
|
||||
throw ValidationException::withMessages([
|
||||
'to_account_short' => '转入账户不能与转出账户相同。',
|
||||
]);
|
||||
}
|
||||
if ($amountCents <= 0) {
|
||||
throw ValidationException::withMessages([
|
||||
'amount' => '动账金额必须大于 0。',
|
||||
]);
|
||||
}
|
||||
|
||||
return $this->connection->transaction(function () use ($data, $date, $from, $to, $amountCents): array {
|
||||
$accounts = $this->connection->table('fin_accounts')
|
||||
->whereIn('account_short', [$from, $to])
|
||||
->orderBy('id')
|
||||
->lockForUpdate()
|
||||
->get(['account_short', 'company_name'])
|
||||
->keyBy('account_short');
|
||||
if (! $accounts->has($from) || ! $accounts->has($to)) {
|
||||
throw ValidationException::withMessages([
|
||||
'from_account_short' => '转出或转入账户不存在,请从账户总表中选择。',
|
||||
]);
|
||||
}
|
||||
|
||||
$idempotencyKey = trim((string) $data['idempotency_key']);
|
||||
$approvalNo = 'IT-' . str_replace('-', '', $date) . '-'
|
||||
. strtoupper(substr(hash('sha256', $idempotencyKey), 0, 8));
|
||||
$prefix = FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE . ':' . $approvalNo;
|
||||
$outgoingKey = hash('sha256', $prefix . ':out');
|
||||
$incomingKey = hash('sha256', $prefix . ':in');
|
||||
$amount = $amountCents / 100;
|
||||
$now = now();
|
||||
$userName = (string) (user()?->name ?? '');
|
||||
$created = 0;
|
||||
foreach ([
|
||||
[
|
||||
'account_short' => $from,
|
||||
'counterparty_info' => $to,
|
||||
'detail' => '内部转账 · 转出至 ' . $to,
|
||||
'income' => 0,
|
||||
'expense' => $amount,
|
||||
'row_key' => $outgoingKey,
|
||||
],
|
||||
[
|
||||
'account_short' => $to,
|
||||
'counterparty_info' => $from,
|
||||
'detail' => '内部转账 · 转入自 ' . $from,
|
||||
'income' => $amount,
|
||||
'expense' => 0,
|
||||
'row_key' => $incomingKey,
|
||||
],
|
||||
] as $row) {
|
||||
$created += $this->connection->table('fin_transactions')->insertOrIgnore([
|
||||
...$row,
|
||||
'txn_date' => $date,
|
||||
'balance' => null,
|
||||
'approval_no' => $approvalNo,
|
||||
'payment_remark' => null,
|
||||
'source' => FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE,
|
||||
'source_value' => null,
|
||||
'process_type' => '内部转账',
|
||||
'synced_at' => $now,
|
||||
'created_at' => $now,
|
||||
'updated_at' => $now,
|
||||
'created_by' => $userName,
|
||||
'updated_by' => $userName,
|
||||
]);
|
||||
}
|
||||
|
||||
if ($created > 0) {
|
||||
$this->audit('internal_transfer_create', $approvalNo, [
|
||||
'txn_date' => $date,
|
||||
'from_account_short' => $from,
|
||||
'to_account_short' => $to,
|
||||
'amount' => $amount,
|
||||
]);
|
||||
$this->calculator->recalculate();
|
||||
}
|
||||
|
||||
$rows = $this->connection->table('fin_transactions')
|
||||
->where('source', FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE)
|
||||
->where('approval_no', $approvalNo)
|
||||
->orderByDesc('expense')
|
||||
->orderBy('id')
|
||||
->get();
|
||||
if ($rows->count() !== 2) {
|
||||
throw new \RuntimeException('内部转账保存不完整,请刷新后重试。');
|
||||
}
|
||||
|
||||
return [
|
||||
'created' => $created > 0,
|
||||
'approval_no' => $approvalNo,
|
||||
'rows' => $rows->all(),
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
/** @return array{approval_no:string,rows:list<object>} */
|
||||
public function delete(int $id): array
|
||||
{
|
||||
return $this->connection->transaction(function () use ($id): array {
|
||||
$row = $this->connection->table('fin_transactions')
|
||||
->where('id', $id)
|
||||
->where('source', FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE)
|
||||
->lockForUpdate()
|
||||
->first();
|
||||
if ($row === null) {
|
||||
throw new NotFoundHttpException('内部转账记录不存在。');
|
||||
}
|
||||
|
||||
$approvalNo = (string) $row->approval_no;
|
||||
$rows = $this->connection->table('fin_transactions')
|
||||
->where('source', FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE)
|
||||
->where('approval_no', $approvalNo)
|
||||
->lockForUpdate()
|
||||
->get();
|
||||
$this->connection->table('fin_transactions')
|
||||
->where('source', FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE)
|
||||
->where('approval_no', $approvalNo)
|
||||
->delete();
|
||||
$this->audit('internal_transfer_delete', $approvalNo, [
|
||||
'rows' => $rows->map(static fn (object $item): array => [
|
||||
'account_short' => (string) $item->account_short,
|
||||
'income' => round((float) $item->income, 2),
|
||||
'expense' => round((float) $item->expense, 2),
|
||||
])->all(),
|
||||
]);
|
||||
$this->calculator->recalculate();
|
||||
|
||||
return [
|
||||
'approval_no' => $approvalNo,
|
||||
'rows' => $rows->all(),
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
/** @param array<string,mixed> $changes */
|
||||
private function audit(string $entityType, string $approvalNo, array $changes): void
|
||||
{
|
||||
$this->connection->table('fin_ledger_edit_events')->insert([
|
||||
'entity_type' => $entityType,
|
||||
'entity_key' => 'internal_transfer|' . $approvalNo,
|
||||
'changes' => json_encode($changes, JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR),
|
||||
'user_id' => user()?->id,
|
||||
'user_name' => (string) (user()?->name ?? ''),
|
||||
'created_at' => now(),
|
||||
]);
|
||||
}
|
||||
|
||||
private function date(mixed $value): string
|
||||
{
|
||||
$text = trim((string) $value);
|
||||
$date = CarbonImmutable::createFromFormat('!Y-m-d', $text);
|
||||
if (! $date instanceof CarbonImmutable || $date->format('Y-m-d') !== $text) {
|
||||
throw ValidationException::withMessages([
|
||||
'txn_date' => '动账日期必须使用 YYYY-MM-DD 格式。',
|
||||
]);
|
||||
}
|
||||
|
||||
return $text;
|
||||
}
|
||||
|
||||
private function cents(mixed $value): int
|
||||
{
|
||||
return (int) round((float) $value * 100);
|
||||
}
|
||||
}
|
||||
@ -18,6 +18,8 @@ class FinanceLedgerTransactionWriter
|
||||
|
||||
public const SHOP_WITHDRAWAL_SOURCE = 'shop_bill';
|
||||
|
||||
public const INTERNAL_TRANSFER_SOURCE = 'internal_transfer';
|
||||
|
||||
public function replace(array $transactions, bool $recalculate = true): array
|
||||
{
|
||||
return $this->persist($transactions, $recalculate, true);
|
||||
@ -101,7 +103,11 @@ class FinanceLedgerTransactionWriter
|
||||
$connection->transaction(function () use ($connection, $rows, $now, $replaceExisting): void {
|
||||
if ($replaceExisting) {
|
||||
$connection->table('fin_transactions')
|
||||
->whereNotIn('source', [self::MANUAL_SOURCE, self::SHOP_WITHDRAWAL_SOURCE])
|
||||
->whereNotIn('source', [
|
||||
self::MANUAL_SOURCE,
|
||||
self::SHOP_WITHDRAWAL_SOURCE,
|
||||
self::INTERNAL_TRANSFER_SOURCE,
|
||||
])
|
||||
->whereNotIn('account_short', FinanceLedgerIndependentAccounts::names())
|
||||
->delete();
|
||||
}
|
||||
@ -146,7 +152,11 @@ class FinanceLedgerTransactionWriter
|
||||
$stats = $connection->table('fin_transactions')
|
||||
->whereNull('deleted_at')
|
||||
->selectRaw('source, source_value, COUNT(*) AS txn_count, SUM(income) AS income_sum, SUM(expense) AS expense_sum')
|
||||
->whereNotIn('source', [self::MANUAL_SOURCE, self::SHOP_WITHDRAWAL_SOURCE])
|
||||
->whereNotIn('source', [
|
||||
self::MANUAL_SOURCE,
|
||||
self::SHOP_WITHDRAWAL_SOURCE,
|
||||
self::INTERNAL_TRANSFER_SOURCE,
|
||||
])
|
||||
->whereNotNull('source_value')
|
||||
->where('source_value', '<>', '')
|
||||
->groupBy('source', 'source_value')
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
'tab' => 'transactions',
|
||||
'txns_view' => $transactionView,
|
||||
]);
|
||||
$sourceLabels = ['dingtalk' => '钉钉审批', 'alipay-company' => '公司支付宝', 'wechat-statement' => '公司微信', 'wangshang-bank' => '邮箱', 'shop' => '店铺提现', 'shop_bill' => '店铺账单提现', 'payable' => '供应商应付', 'store' => '店铺开店', 'workorder' => '聚工单', 'manual' => '手工录入'];
|
||||
$sourceLabels = ['dingtalk' => '钉钉审批', 'alipay-company' => '公司支付宝', 'wechat-statement' => '公司微信', 'wangshang-bank' => '邮箱', 'shop' => '店铺提现', 'shop_bill' => '店铺账单提现', 'payable' => '供应商应付', 'store' => '店铺开店', 'workorder' => '聚工单', 'manual' => '手工录入', 'internal_transfer' => '内部转账'];
|
||||
$shopBalanceDate = $ledgerShopBalanceDate ?? null;
|
||||
$shopBalanceDates = $ledgerShopBalanceDates ?? [];
|
||||
$manualTransactionAccountOptions = $ledgerManualTransactionAccountOptions ?? [];
|
||||
@ -2018,6 +2018,12 @@
|
||||
<span class="material-icons-outlined" aria-hidden="true">add</span>
|
||||
{{ $transactionViewIsIndependent ? '新增明细' : '新增手工明细' }}
|
||||
</button>
|
||||
@if (!$transactionViewIsIndependent)
|
||||
<button class="ledger-manual-trigger" type="button" data-ledger-internal-transfer-trigger @disabled(count($manualTransactionAccountOptions) < 2)>
|
||||
<span class="material-icons-outlined" aria-hidden="true">swap_horiz</span>
|
||||
内部转账
|
||||
</button>
|
||||
@endif
|
||||
<button class="ledger-manual-trigger" type="button" data-ledger-statement-column-add @if (!$transactionViewIsIndependent) hidden @endif>
|
||||
<span class="material-icons-outlined" aria-hidden="true">view_column</span>
|
||||
新增自定义列
|
||||
@ -2059,7 +2065,7 @@
|
||||
@endif
|
||||
<tbody data-ledger-transaction-tbody>
|
||||
@forelse ($ledgerTransactions as $row)
|
||||
<tr class="ledger-transaction-row" data-ledger-transaction-row data-transaction-id="{{ $row->id }}" data-source="{{ $row->source }}"
|
||||
<tr class="ledger-transaction-row" data-ledger-transaction-row data-transaction-id="{{ $row->id }}" data-source="{{ $row->source }}" data-approval-no="{{ $row->approval_no }}"
|
||||
@if ($canEditTransactions && ($row->source === 'manual' || $transactionViewIsIndependent))
|
||||
data-ledger-manual-row
|
||||
data-editable-independent="{{ $transactionViewIsIndependent ? '1' : '0' }}"
|
||||
@ -2073,7 +2079,6 @@
|
||||
data-income="{{ $row->income }}"
|
||||
data-expense="{{ $row->expense }}"
|
||||
data-balance="{{ $row->balance }}"
|
||||
data-approval-no="{{ $row->approval_no }}"
|
||||
data-payment-remark="{{ $row->payment_remark }}"
|
||||
data-source-value="{{ $row->source }}"
|
||||
data-custom-values="{{ json_encode($row->custom_values ?? [], JSON_UNESCAPED_UNICODE) }}"
|
||||
@ -2081,7 +2086,7 @@
|
||||
>
|
||||
<td>{{ $date($row->txn_date) }}</td>
|
||||
<td>
|
||||
@if ($canEditTransactions && !$transactionViewIsIndependent)
|
||||
@if ($canEditTransactions && !$transactionViewIsIndependent && $row->source !== 'internal_transfer')
|
||||
<input class="ledger-transaction-account-input" type="text" list="ledger-manual-account-options" value="{{ $row->effective_account_short === '未匹配' ? '' : $row->effective_account_short }}" placeholder="选择账户简称" autocomplete="off" aria-label="修改动账明细账户简称" title="输入并选择账户总表简称" data-ledger-transaction-account data-url="{{ route('business.financial-ledger.transactions.account.update', ['id' => $row->id]) }}" data-previous-account="{{ $row->effective_account_short === '未匹配' ? '' : $row->effective_account_short }}" data-account-group="{{ $row->source === 'manual' || blank($row->source_value) ? 'transaction:' . $row->id : hash('sha256', (string) $row->source . '|' . (string) $row->source_value) }}">
|
||||
@else
|
||||
<span class="{{ $row->effective_account_short === '未匹配' ? 'danger' : '' }}">{{ $row->effective_account_short }}</span>
|
||||
@ -2097,7 +2102,9 @@
|
||||
<td>
|
||||
<div class="ledger-transaction-approval-actions">
|
||||
<span title="{{ $row->approval_no }}">{{ $row->approval_no }}</span>
|
||||
@if ($canEditTransactions && ($row->source === 'manual' || $transactionViewIsIndependent))
|
||||
@if ($canEditTransactions && $row->source === 'internal_transfer')
|
||||
<button class="ledger-row-edit is-delete" type="button" title="删除整笔内部转账" aria-label="删除内部转账 {{ $row->approval_no }}" data-ledger-internal-transfer-delete data-url="{{ route('business.financial-ledger.transfers.internal.delete', ['id' => $row->id]) }}"><span class="material-icons-outlined" aria-hidden="true">delete</span></button>
|
||||
@elseif ($canEditTransactions && ($row->source === 'manual' || $transactionViewIsIndependent))
|
||||
@if ($transactionViewIsIndependent)
|
||||
<button class="ledger-row-edit ledger-row-insert" type="button" title="在此行附近插入明细" aria-label="在此行附近插入明细 {{ $row->approval_no }}" data-ledger-excel-row-trigger><span class="material-icons-outlined" aria-hidden="true">playlist_add</span></button>
|
||||
@endif
|
||||
@ -2299,6 +2306,43 @@
|
||||
@endif
|
||||
|
||||
@if ($canEditTransactions)
|
||||
<dialog class="ledger-company-dialog ledger-edit-dialog" data-ledger-internal-transfer-dialog aria-labelledby="ledger-internal-transfer-title">
|
||||
<form class="ledger-company-form" method="POST" action="{{ route('business.financial-ledger.transfers.internal') }}" data-ledger-internal-transfer-form>
|
||||
@csrf
|
||||
<input type="hidden" name="idempotency_key" value="{{ (string) \Illuminate\Support\Str::uuid() }}" data-ledger-internal-transfer-token>
|
||||
<div class="ledger-company-form__head">
|
||||
<div>
|
||||
<h2 id="ledger-internal-transfer-title">内部转账</h2>
|
||||
<p>填写一次,系统同时生成转出和转入两条动账明细。</p>
|
||||
</div>
|
||||
<button class="ledger-company-form__close" type="button" aria-label="关闭内部转账" data-ledger-internal-transfer-close><span class="material-icons-outlined" aria-hidden="true">close</span></button>
|
||||
</div>
|
||||
<div class="ledger-company-form__grid">
|
||||
<div class="ledger-company-field">
|
||||
<label for="ledger-internal-transfer-date">动账日期 <span aria-hidden="true">*</span></label>
|
||||
<input id="ledger-internal-transfer-date" name="txn_date" type="date" value="{{ $manualTransactionDate }}" min="{{ $ledgerOpeningDate }}" max="{{ $transactionPeriod['to'] ?? '' }}" required data-ledger-internal-transfer-date>
|
||||
</div>
|
||||
<div class="ledger-company-field">
|
||||
<label for="ledger-internal-transfer-amount">动账金额(元) <span aria-hidden="true">*</span></label>
|
||||
<input id="ledger-internal-transfer-amount" name="amount" type="number" min="0.01" step="0.01" placeholder="0.00" required data-ledger-internal-transfer-amount>
|
||||
</div>
|
||||
<div class="ledger-company-field ledger-edit-field--wide">
|
||||
<label for="ledger-internal-transfer-from">转出账户 <span aria-hidden="true">*</span></label>
|
||||
<input id="ledger-internal-transfer-from" name="from_account_short" type="text" list="ledger-manual-account-options" maxlength="100" placeholder="选择转出账户简称" autocomplete="off" required data-ledger-internal-transfer-from>
|
||||
</div>
|
||||
<div class="ledger-company-field ledger-edit-field--wide">
|
||||
<label for="ledger-internal-transfer-to">转入账户 <span aria-hidden="true">*</span></label>
|
||||
<input id="ledger-internal-transfer-to" name="to_account_short" type="text" list="ledger-manual-account-options" maxlength="100" placeholder="选择转入账户简称" autocomplete="off" required data-ledger-internal-transfer-to>
|
||||
</div>
|
||||
</div>
|
||||
<p class="ledger-company-form__message" role="alert" data-ledger-internal-transfer-error hidden></p>
|
||||
<div class="ledger-company-form__actions">
|
||||
<button class="ledger-btn" type="button" data-ledger-internal-transfer-cancel>取消</button>
|
||||
<button class="ledger-btn primary" type="submit" data-ledger-internal-transfer-save><span class="material-icons-outlined" aria-hidden="true">swap_horiz</span>确认转账</button>
|
||||
</div>
|
||||
</form>
|
||||
</dialog>
|
||||
|
||||
<dialog class="ledger-company-dialog ledger-edit-dialog" data-ledger-manual-edit-dialog aria-labelledby="ledger-manual-edit-title">
|
||||
<form class="ledger-company-form" method="POST" data-ledger-manual-edit-form>
|
||||
@csrf
|
||||
@ -3215,6 +3259,7 @@
|
||||
tableRow.dataset.ledgerTransactionRow = '';
|
||||
tableRow.dataset.transactionId = String(row.id);
|
||||
tableRow.dataset.source = row.source;
|
||||
tableRow.dataset.approvalNo = row.approval_no || '';
|
||||
if (independent) {
|
||||
tableRow.dataset.ledgerManualRow = '';
|
||||
tableRow.dataset.editableIndependent = '1';
|
||||
@ -3228,7 +3273,6 @@
|
||||
tableRow.dataset.income = String(row.income ?? 0);
|
||||
tableRow.dataset.expense = String(row.expense ?? 0);
|
||||
tableRow.dataset.balance = row.balance ?? '';
|
||||
tableRow.dataset.approvalNo = row.approval_no || '';
|
||||
tableRow.dataset.paymentRemark = row.payment_remark || '';
|
||||
tableRow.dataset.sourceValue = row.source || 'manual';
|
||||
tableRow.dataset.customValues = JSON.stringify(row.custom_values || {});
|
||||
@ -3245,6 +3289,8 @@
|
||||
const accountCell = addCell();
|
||||
if (independent) {
|
||||
accountCell.textContent = row.account_short;
|
||||
} else if (row.source === 'internal_transfer') {
|
||||
accountCell.textContent = row.account_short;
|
||||
} else {
|
||||
const accountEditor = createTransactionAccountInput(row.id, row.account_short, 'transaction:' + row.id);
|
||||
accountCell.appendChild(accountEditor);
|
||||
@ -3293,6 +3339,16 @@
|
||||
deleteButton.setAttribute('aria-label', '删除明细 ' + (row.approval_no || ''));
|
||||
deleteButton.innerHTML = '<span class="material-icons-outlined" aria-hidden="true">delete</span>';
|
||||
approvalActions.appendChild(deleteButton);
|
||||
} else if (row.source === 'internal_transfer') {
|
||||
const deleteButton = document.createElement('button');
|
||||
deleteButton.className = 'ledger-row-edit is-delete';
|
||||
deleteButton.type = 'button';
|
||||
deleteButton.dataset.ledgerInternalTransferDelete = '';
|
||||
deleteButton.dataset.url = row.delete_url || '';
|
||||
deleteButton.title = '删除整笔内部转账';
|
||||
deleteButton.setAttribute('aria-label', '删除内部转账 ' + (row.approval_no || ''));
|
||||
deleteButton.innerHTML = '<span class="material-icons-outlined" aria-hidden="true">delete</span>';
|
||||
approvalActions.appendChild(deleteButton);
|
||||
}
|
||||
approvalCell.appendChild(approvalActions);
|
||||
currentTransactionCustomFields().forEach((field) => addCell('').dataset.customFieldKey = field.field_key || '');
|
||||
@ -3300,6 +3356,29 @@
|
||||
manualTransactionDraft.insertAdjacentElement('afterend', tableRow);
|
||||
};
|
||||
|
||||
const applyTransactionSummary = (payload) => {
|
||||
if (!payload?.summary) return;
|
||||
if (summaryPreviousClosing) {
|
||||
summaryPreviousClosing.textContent = formatSummaryWan(payload.summary.previous_closing);
|
||||
summaryPreviousClosing.title = formatSummaryYuanTitle(payload.summary.previous_closing);
|
||||
}
|
||||
if (summaryIncome) {
|
||||
summaryIncome.textContent = formatSummaryWan(payload.summary.income);
|
||||
summaryIncome.title = formatSummaryYuanTitle(payload.summary.income);
|
||||
}
|
||||
if (summaryExpense) {
|
||||
summaryExpense.textContent = formatSummaryWan(payload.summary.expense);
|
||||
summaryExpense.title = formatSummaryYuanTitle(payload.summary.expense);
|
||||
}
|
||||
if (summaryCurrentBalance) {
|
||||
summaryCurrentBalance.textContent = formatSummaryWan(payload.summary.current_balance);
|
||||
summaryCurrentBalance.title = formatSummaryYuanTitle(payload.summary.current_balance);
|
||||
}
|
||||
if (metaTransactions && payload.total_transactions !== undefined) {
|
||||
metaTransactions.textContent = integerFormatter.format(payload.total_transactions);
|
||||
}
|
||||
};
|
||||
|
||||
manualTransactionTrigger.addEventListener('click', () => showManualDraft(true));
|
||||
cancelButton?.addEventListener('click', () => resetManualDraft());
|
||||
accountInput?.addEventListener('input', () => accountInput.setCustomValidity(''));
|
||||
@ -3365,23 +3444,7 @@
|
||||
}
|
||||
|
||||
appendManualRow(payload.row);
|
||||
if (summaryPreviousClosing) {
|
||||
summaryPreviousClosing.textContent = formatSummaryWan(payload.summary.previous_closing);
|
||||
summaryPreviousClosing.title = formatSummaryYuanTitle(payload.summary.previous_closing);
|
||||
}
|
||||
if (summaryIncome) {
|
||||
summaryIncome.textContent = formatSummaryWan(payload.summary.income);
|
||||
summaryIncome.title = formatSummaryYuanTitle(payload.summary.income);
|
||||
}
|
||||
if (summaryExpense) {
|
||||
summaryExpense.textContent = formatSummaryWan(payload.summary.expense);
|
||||
summaryExpense.title = formatSummaryYuanTitle(payload.summary.expense);
|
||||
}
|
||||
if (summaryCurrentBalance) {
|
||||
summaryCurrentBalance.textContent = formatSummaryWan(payload.summary.current_balance);
|
||||
summaryCurrentBalance.title = formatSummaryYuanTitle(payload.summary.current_balance);
|
||||
}
|
||||
if (metaTransactions) metaTransactions.textContent = integerFormatter.format(payload.total_transactions);
|
||||
applyTransactionSummary(payload);
|
||||
ledgerDependentDataStale = true;
|
||||
resetManualDraft(payload.next_idempotency_key);
|
||||
const balance = payload.daily_flow
|
||||
@ -3397,6 +3460,146 @@
|
||||
manualTransactionForm.removeAttribute('aria-busy');
|
||||
}
|
||||
});
|
||||
|
||||
const internalTransferDialog = page.querySelector('[data-ledger-internal-transfer-dialog]');
|
||||
const internalTransferTrigger = page.querySelector('[data-ledger-internal-transfer-trigger]');
|
||||
const internalTransferForm = page.querySelector('[data-ledger-internal-transfer-form]');
|
||||
if (internalTransferDialog && internalTransferTrigger && internalTransferForm) {
|
||||
const internalTransferToken = internalTransferForm.querySelector('[data-ledger-internal-transfer-token]');
|
||||
const internalTransferDate = internalTransferForm.querySelector('[data-ledger-internal-transfer-date]');
|
||||
const internalTransferAmount = internalTransferForm.querySelector('[data-ledger-internal-transfer-amount]');
|
||||
const internalTransferFrom = internalTransferForm.querySelector('[data-ledger-internal-transfer-from]');
|
||||
const internalTransferTo = internalTransferForm.querySelector('[data-ledger-internal-transfer-to]');
|
||||
const internalTransferError = internalTransferForm.querySelector('[data-ledger-internal-transfer-error]');
|
||||
const internalTransferSave = internalTransferForm.querySelector('[data-ledger-internal-transfer-save]');
|
||||
const closeInternalTransfer = () => {
|
||||
if (internalTransferDialog.open) internalTransferDialog.close();
|
||||
};
|
||||
const validateInternalTransferAccount = (input) => {
|
||||
const value = input.value.trim();
|
||||
const invalid = value !== '' && !ledgerAccountShortValues.has(value);
|
||||
input.setCustomValidity(invalid ? '请选择账户总表中的账户简称' : '');
|
||||
return !invalid;
|
||||
};
|
||||
const showInternalTransferError = (message) => {
|
||||
if (!internalTransferError) return;
|
||||
internalTransferError.textContent = message;
|
||||
internalTransferError.hidden = false;
|
||||
};
|
||||
|
||||
internalTransferTrigger.addEventListener('click', () => {
|
||||
internalTransferForm.reset();
|
||||
if (internalTransferToken) internalTransferToken.value = window.crypto?.randomUUID?.() || internalTransferToken.value;
|
||||
if (internalTransferDate) internalTransferDate.value = dateInput?.value || internalTransferDate.value;
|
||||
if (internalTransferError) internalTransferError.hidden = true;
|
||||
internalTransferDialog.showModal();
|
||||
internalTransferDate?.focus();
|
||||
});
|
||||
internalTransferForm.querySelectorAll('[data-ledger-internal-transfer-close], [data-ledger-internal-transfer-cancel]')
|
||||
.forEach((button) => button.addEventListener('click', closeInternalTransfer));
|
||||
[internalTransferFrom, internalTransferTo].forEach((input) => {
|
||||
input?.addEventListener('input', () => input.setCustomValidity(''));
|
||||
input?.addEventListener('change', () => validateInternalTransferAccount(input));
|
||||
input?.addEventListener('blur', () => validateInternalTransferAccount(input));
|
||||
});
|
||||
internalTransferForm.addEventListener('submit', async (event) => {
|
||||
event.preventDefault();
|
||||
const from = internalTransferFrom?.value.trim() || '';
|
||||
const to = internalTransferTo?.value.trim() || '';
|
||||
const amount = Number(internalTransferAmount?.value || 0);
|
||||
if (!validateInternalTransferAccount(internalTransferFrom)
|
||||
|| !validateInternalTransferAccount(internalTransferTo)) {
|
||||
internalTransferForm.reportValidity();
|
||||
return;
|
||||
}
|
||||
if (from === to) {
|
||||
showInternalTransferError('转入账户不能与转出账户相同。');
|
||||
internalTransferTo?.focus();
|
||||
return;
|
||||
}
|
||||
if (!amount) {
|
||||
showInternalTransferError('动账金额必须大于 0。');
|
||||
internalTransferAmount?.focus();
|
||||
return;
|
||||
}
|
||||
|
||||
if (internalTransferError) internalTransferError.hidden = true;
|
||||
if (internalTransferSave) internalTransferSave.disabled = true;
|
||||
internalTransferForm.setAttribute('aria-busy', 'true');
|
||||
try {
|
||||
const requestUrl = new URL(internalTransferForm.action, window.location.origin);
|
||||
const currentUrl = new URL(window.location.href);
|
||||
currentUrl.searchParams.forEach((value, key) => requestUrl.searchParams.set(key, value));
|
||||
const response = await fetch(requestUrl.toString(), {
|
||||
method: 'POST',
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
body: new FormData(internalTransferForm),
|
||||
});
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
const firstError = Object.values(payload.errors || {})[0]?.[0];
|
||||
throw new Error(firstError || payload.message || '内部转账保存失败');
|
||||
}
|
||||
|
||||
(payload.rows || []).forEach(appendManualRow);
|
||||
applyTransactionSummary(payload);
|
||||
ledgerDependentDataStale = true;
|
||||
closeInternalTransfer();
|
||||
internalTransferForm.reset();
|
||||
if (internalTransferToken) {
|
||||
internalTransferToken.value = payload.next_idempotency_key || internalTransferToken.value;
|
||||
}
|
||||
notify('内部转账已保存:转出账户减少 ' + moneyFormatter.format(amount) + ' 元,转入账户同步增加');
|
||||
} catch (error) {
|
||||
showInternalTransferError(error.message || '内部转账保存失败');
|
||||
} finally {
|
||||
if (internalTransferSave) internalTransferSave.disabled = false;
|
||||
internalTransferForm.removeAttribute('aria-busy');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
page.addEventListener('click', async (event) => {
|
||||
const button = event.target.closest('[data-ledger-internal-transfer-delete]');
|
||||
if (!button) return;
|
||||
const row = button.closest('tr[data-ledger-transaction-row]');
|
||||
const approvalNo = row?.dataset.approvalNo || '';
|
||||
if (!row || !approvalNo || !button.dataset.url) return;
|
||||
if (!window.confirm('确认删除整笔内部转账?转出账户和转入账户会同时恢复。')) return;
|
||||
|
||||
button.disabled = true;
|
||||
try {
|
||||
const response = await fetch(button.dataset.url, {
|
||||
method: 'DELETE',
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'X-CSRF-TOKEN': ledgerCsrfToken,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
});
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
const firstError = Object.values(payload.errors || {})[0]?.[0];
|
||||
throw new Error(firstError || payload.message || '内部转账删除失败');
|
||||
}
|
||||
Array.from(page.querySelectorAll('tr[data-ledger-transaction-row]'))
|
||||
.filter((item) => item.dataset.source === 'internal_transfer'
|
||||
&& item.dataset.approvalNo === approvalNo)
|
||||
.forEach((item) => item.remove());
|
||||
applyTransactionSummary(payload);
|
||||
ledgerDependentDataStale = true;
|
||||
notify('内部转账已删除,两边账户余额已恢复');
|
||||
} catch (error) {
|
||||
notify(error.message || '内部转账删除失败', true);
|
||||
} finally {
|
||||
button.disabled = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const manualEditDialog = page.querySelector('[data-ledger-manual-edit-dialog]');
|
||||
|
||||
@ -896,6 +896,15 @@ Route::post('workspace/financial-ledger/transactions/manual', [\App\Http\Control
|
||||
->middleware('business.page:financial-operations,ledger')
|
||||
->name('business.financial-ledger.transactions.manual');
|
||||
|
||||
Route::post('workspace/financial-ledger/transfers/internal', [\App\Http\Controllers\Business\FinanceLedger::class, 'storeInternalTransfer'])
|
||||
->middleware('business.page:financial-operations,ledger')
|
||||
->name('business.financial-ledger.transfers.internal');
|
||||
|
||||
Route::delete('workspace/financial-ledger/transfers/internal/{id}', [\App\Http\Controllers\Business\FinanceLedger::class, 'deleteInternalTransfer'])
|
||||
->whereNumber('id')
|
||||
->middleware('business.page:financial-operations,ledger')
|
||||
->name('business.financial-ledger.transfers.internal.delete');
|
||||
|
||||
Route::post('workspace/financial-ledger/shop-data/sync', [\App\Http\Controllers\Business\FinanceLedger::class, 'syncShopData'])
|
||||
->middleware('business.page:financial-operations,ledger')
|
||||
->name('business.financial-ledger.shop-data.sync');
|
||||
|
||||
@ -65,6 +65,21 @@ class FinanceLedgerManualTransactionTest extends FeatureTestCase
|
||||
]);
|
||||
}
|
||||
|
||||
private function internalTransferUrl(): string
|
||||
{
|
||||
return route('business.financial-ledger.transfers.internal', [
|
||||
'company_id' => $this->company->id,
|
||||
]);
|
||||
}
|
||||
|
||||
private function internalTransferDeleteUrl(int $id): string
|
||||
{
|
||||
return route('business.financial-ledger.transfers.internal.delete', [
|
||||
'company_id' => $this->company->id,
|
||||
'id' => $id,
|
||||
]);
|
||||
}
|
||||
|
||||
private function transactionAccountUrl(int $transactionId): string
|
||||
{
|
||||
return route('business.financial-ledger.transactions.account.update', [
|
||||
@ -373,6 +388,109 @@ class FinanceLedgerManualTransactionTest extends FeatureTestCase
|
||||
->assertSee('手工录入');
|
||||
}
|
||||
|
||||
public function test_internal_transfer_page_creates_and_deletes_both_sides_atomically(): void
|
||||
{
|
||||
$payload = [
|
||||
'idempotency_key' => 'cb2a1b74-5fa6-4ff4-981a-6b80eb77c672',
|
||||
'txn_date' => '2026-10-18',
|
||||
'from_account_short' => '手工账户甲',
|
||||
'to_account_short' => '手工账户乙',
|
||||
'amount' => 30,
|
||||
];
|
||||
|
||||
$response = $this->loginAs()->postJson($this->internalTransferUrl(), $payload)
|
||||
->assertCreated()
|
||||
->assertJsonPath('created', true)
|
||||
->assertJsonCount(2, 'rows')
|
||||
->assertJsonPath('summary.expense', 30)
|
||||
->assertJsonPath('summary.income', 30)
|
||||
->assertJsonPath('summary.current_balance', 100);
|
||||
$rows = collect($response->json('rows'));
|
||||
$outgoing = $rows->firstWhere('expense', 30);
|
||||
$incoming = $rows->firstWhere('income', 30);
|
||||
$this->assertNotNull($outgoing);
|
||||
$this->assertNotNull($incoming);
|
||||
$this->assertSame('手工账户甲', $outgoing['account_short']);
|
||||
$this->assertSame('手工账户乙', $incoming['account_short']);
|
||||
$this->assertSame('内部转账', $outgoing['source_label']);
|
||||
$this->assertSame($outgoing['approval_no'], $incoming['approval_no']);
|
||||
|
||||
$this->assertDatabaseHas('fin_transactions', [
|
||||
'source' => FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE,
|
||||
'account_short' => '手工账户甲',
|
||||
'expense' => 30,
|
||||
'income' => 0,
|
||||
], 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_transactions', [
|
||||
'source' => FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE,
|
||||
'account_short' => '手工账户乙',
|
||||
'expense' => 0,
|
||||
'income' => 30,
|
||||
], 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_accounts', [
|
||||
'account_short' => '手工账户甲',
|
||||
'current_balance' => 70,
|
||||
], 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_accounts', [
|
||||
'account_short' => '手工账户乙',
|
||||
'current_balance' => 30,
|
||||
], 'business_mirror');
|
||||
|
||||
$this->postJson($this->internalTransferUrl(), $payload)
|
||||
->assertOk()
|
||||
->assertJsonPath('created', false);
|
||||
$this->assertDatabaseCount('fin_transactions', 2, 'business_mirror');
|
||||
|
||||
$connection = DB::connection('business_mirror');
|
||||
app(FinanceLedgerTransactionWriter::class)->replace([[
|
||||
'txn_date' => '2026-10-18',
|
||||
'account_short' => '手工账户甲',
|
||||
'detail' => '上游快照行',
|
||||
'income' => 0,
|
||||
'expense' => 0,
|
||||
'source' => 'upstream-test',
|
||||
'source_value' => 'snapshot',
|
||||
'process_type' => '快照测试',
|
||||
]], false);
|
||||
$this->assertSame(2, $connection->table('fin_transactions')
|
||||
->where('source', FinanceLedgerTransactionWriter::INTERNAL_TRANSFER_SOURCE)
|
||||
->count());
|
||||
|
||||
$this->deleteJson($this->internalTransferDeleteUrl((int) $outgoing['id']))
|
||||
->assertOk()
|
||||
->assertJsonPath('deleted', true)
|
||||
->assertJsonPath('summary.current_balance', 100);
|
||||
$this->assertDatabaseCount('fin_transactions', 1, 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_accounts', [
|
||||
'account_short' => '手工账户甲',
|
||||
'current_balance' => 100,
|
||||
], 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_accounts', [
|
||||
'account_short' => '手工账户乙',
|
||||
'current_balance' => 0,
|
||||
], 'business_mirror');
|
||||
}
|
||||
|
||||
public function test_internal_transfer_page_and_same_account_validation(): void
|
||||
{
|
||||
$this->loginAs()->get($this->pageUrl())
|
||||
->assertOk()
|
||||
->assertSee('内部转账')
|
||||
->assertSee('data-ledger-internal-transfer-trigger', false)
|
||||
->assertSee('data-ledger-internal-transfer-dialog', false)
|
||||
->assertSee('name="from_account_short"', false)
|
||||
->assertSee('name="to_account_short"', false)
|
||||
->assertSee('name="amount"', false);
|
||||
|
||||
$this->withExceptionHandling()->postJson($this->internalTransferUrl(), [
|
||||
'idempotency_key' => '571a8b67-9a06-4309-836f-296ca74624ba',
|
||||
'txn_date' => '2026-10-18',
|
||||
'from_account_short' => '手工账户甲',
|
||||
'to_account_short' => '手工账户甲',
|
||||
'amount' => 50,
|
||||
])->assertUnprocessable()->assertJsonValidationErrors('to_account_short');
|
||||
}
|
||||
|
||||
public function test_manual_income_is_saved_and_updates_daily_flow_and_current_balance(): void
|
||||
{
|
||||
$response = $this->loginAs()->postJson($this->storeUrl(), $this->payload([
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user