wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed order report for https://guangdagit.com/beike/beikeshop/issues/135

This commit is contained in:
Edward Yang 2022-08-19 14:02:16 +08:00
parent 714c720bcf
commit da28dcdcc8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beike/Admin/Repositories/Report/OrderReportRepo.php
View File

@ -26,13 +26,13 @@ class OrderReportRepo
*/
public static function getLatestMonth()
{
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subMonth(), 'end' => today()->subDay()])
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subMonth(), 'end' => today()])
->select(DB::raw('DATE(created_at) as date, count(*) as total'))
->groupBy('date')
->get()
->keyBy('date');
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subMonth(), 'end' => today()->subDay()])
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subMonth(), 'end' => today()])
->select(DB::raw('DATE(created_at) as date, sum(total) as amount'))
->groupBy('date')
->get()
@ -64,13 +64,13 @@ class OrderReportRepo
*/
public static function getLatestWeek()
{
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subWeek(), 'end' => today()->subDay()])
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subWeek(), 'end' => today()])
->select(DB::raw('DATE(created_at) as date, count(*) as total'))
->groupBy('date')
->get()
->keyBy('date');
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subWeek(), 'end' => today()->subDay()])
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subWeek(), 'end' => today()])
->select(DB::raw('DATE(created_at) as date, sum(total) as amount'))
->groupBy('date')
->get()
@ -102,7 +102,7 @@ class OrderReportRepo
*/
public static function getLatestYear()
{
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subYear(), 'end' => today()->subDay()])
$orderTotals = OrderRepo::getListBuilder(['start' => today()->subYear(), 'end' => today()])
->select(DB::raw('YEAR(created_at) as year, MONTH(created_at) as month, count(*) as total'))
->groupBy(['year', 'month'])
->get();
@ -112,7 +112,7 @@ class OrderReportRepo
$orderMonthTotals[$key] = $orderTotal['total'];
}
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subYear(), 'end' => today()->subDay()])
$orderAmounts = OrderRepo::getListBuilder(['start' => today()->subYear(), 'end' => today()])
->select(DB::raw('YEAR(created_at) as year, MONTH(created_at) as month, sum(total) as amount'))
->groupBy(['year', 'month'])
->get();