pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

main
Jing Li 2024-05-14 15:34:09 +08:00
parent 0deebe8a30
commit 694c7f2960
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Admin/Controllers/Finance/SalesStatisticController.php
View File

@ -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();
}

2
app/Http/Controllers/Api/LedgerController.php
View File

@ -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();
}

26
database/seeders/KeywordSeeder.php
View File

@ -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' => ''],
],
],
[