diff --git a/app/Admin/Controllers/Finance/SalesStatisticController.php b/app/Admin/Controllers/Finance/SalesStatisticController.php index 4b287b7..5af8607 100644 --- a/app/Admin/Controllers/Finance/SalesStatisticController.php +++ b/app/Admin/Controllers/Finance/SalesStatisticController.php @@ -53,8 +53,8 @@ class SalesStatisticController extends AdminController ]) ->affixRow([ ['type' => 'text', 'text' => '合计'], - ['type' => 'tpl', 'text' => '${items|filter:is_plus:isTrue|pick:sales|sum}'], - ['type' => 'tpl', 'text' => '${items|filter:is_plus:isTrue|pick:expenditure|sum}'], + ['type' => 'tpl', 'text' => '${items|pick:real_sales|sum}'], + ['type' => 'tpl', 'text' => '${items|pick:real_expenditure|sum}'], ]) ) ); @@ -84,7 +84,16 @@ class SalesStatisticController extends AdminController 'name' => $lotteryType->name, 'sales' => trim_zeros($statistic->sales ?? '0.00'), 'expenditure' => trim_zeros($statistic->expenditure ?? '0.00'), - 'is_plus' => $lotteryType->value !== '-', + 'real_sales' => match($lotteryType->value) { + '+' => $statistic->sales ?? '0.00', + '-' => -($statistic->sales ?? '0.00'), + default => 0, + }, + 'real_expenditure' => match($lotteryType->value) { + '+' => $statistic->expenditure ?? '0.00', + '-' => -($statistic->expenditure ?? '0.00'), + default => 0, + }, ]; })->all(); } diff --git a/app/Http/Controllers/Api/LedgerController.php b/app/Http/Controllers/Api/LedgerController.php index c276f72..b3e0b45 100644 --- a/app/Http/Controllers/Api/LedgerController.php +++ b/app/Http/Controllers/Api/LedgerController.php @@ -225,7 +225,7 @@ class LedgerController extends Controller 'name' => $lotteryType->name, 'sales' => $ledgerItem?->sales, 'expenditure' => $ledgerItem?->expenditure, - 'operator' => (string) $lotteryType->value === '-' ? '-' : '+', + 'operator' => (string) $lotteryType->value, ]; })->all(); } diff --git a/database/seeders/KeywordSeeder.php b/database/seeders/KeywordSeeder.php index e27c48c..a0108c2 100644 --- a/database/seeders/KeywordSeeder.php +++ b/database/seeders/KeywordSeeder.php @@ -63,19 +63,19 @@ class KeywordSeeder extends Seeder 'key' => 'lottery_type', 'name' => '彩种类型', 'children' => [ - '七星彩', - '排列三', - '排列五', - '大乐透', - '传统足彩', - '竞彩', - '顶呱刮', - '福彩', - '合买', - '电彩分票+', - '即开分票+', - ['name' => '电彩分票-', 'value' => '-'], - ['name' => '即开分票-', 'value' => '-'], + ['name' => '七星彩', 'value' => '+'], + ['name' => '排列三', 'value' => '+'], + ['name' => '排列五', 'value' => '+'], + ['name' => '大乐透', 'value' => '+'], + ['name' => '传统足彩', 'value' => '+'], + ['name' => '竞彩', 'value' => '+'], + ['name' => '顶呱刮', 'value' => '+'], + ['name' => '福彩', 'value' => '+'], + ['name' => '合买', 'value' => '+'], + ['name' => '电彩分票+', 'value' => ''], + ['name' => '即开分票+', 'value' => ''], + ['name' => '电彩分票-', 'value' => ''], + ['name' => '即开分票-', 'value' => ''], ], ], [