From 55f562ac15820629982d7f5b7c72ae5a17553f90 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 15 Apr 2024 21:53:23 +0800 Subject: [PATCH] Update --- app/Http/Controllers/Api/StatsController.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/StatsController.php b/app/Http/Controllers/Api/StatsController.php index 647fc11..d160e56 100644 --- a/app/Http/Controllers/Api/StatsController.php +++ b/app/Http/Controllers/Api/StatsController.php @@ -30,28 +30,27 @@ class StatsController extends Controller }); }, fn ($query) => $query->where('store_id', $user->store_id)); - // 今天 - $today = Carbon::today(); + // 昨天 + $yesterday = Carbon::yesterday(); //-------------------------------------------------------------------------- // 本月总账录入 //-------------------------------------------------------------------------- $currentMonthLedger = (clone $query) ->select([DB::raw('SUM(sales) as sales'), DB::raw('SUM(expenditure) as expenditure')]) - ->whereBetween('date', [$today->copy()->startOfMonth()->format('Y-m-d'), $today->format('Y-m-d')]) + ->whereBetween('date', [$yesterday->copy()->startOfMonth()->format('Y-m-d'), $yesterday->format('Y-m-d')]) ->first(); //-------------------------------------------------------------------------- // 昨日总账录入 //-------------------------------------------------------------------------- - $yesterday = $today->copy()->subDay(); $yesterdayLedger = (clone $query)->where('date', $yesterday->format('Y-m-d'))->first(); //-------------------------------------------------------------------------- // 近 30 天趋势数据 //-------------------------------------------------------------------------- - $start = $today->copy()->subDays(30); - $end = $start->copy()->addDays(29); + $start = $yesterday->copy()->subDays(29); + $end = $yesterday->copy(); /** @var \Illuminate\Database\Eloquent\Collection */ $ledgers30days = (clone $query) ->whereBetween('date', [$start, $end]) @@ -62,7 +61,7 @@ class StatsController extends Controller // 本月总账录入 'current_month_ledger' => [ // 截止日期 - 'deadline' => $today->format('Y-m-d'), + 'deadline' => $yesterday->format('Y-m-d'), 'sales' => trim_zeros($currentMonthLedger->sales ?? 0), 'expenditure' => trim_zeros($currentMonthLedger->expenditure ?? 0), ],