diff --git a/app/Http/Controllers/Api/StatisticsController.php b/app/Http/Controllers/Api/StatisticsController.php index 00bb393..2705a96 100644 --- a/app/Http/Controllers/Api/StatisticsController.php +++ b/app/Http/Controllers/Api/StatisticsController.php @@ -91,18 +91,15 @@ class StatisticsController extends Controller $input = $this->filterInput($request); + $dateRange1 = $request->input('start_at').','.$request->input('end_at'); + $dateRange2 = $request->input('before_start_at').','.$request->input('before_end_at'); + $ledger = $statisticService->ledger( - array_merge($input, [ - 'start_at' => $request->input('start_at'), - 'end_at' => $request->input('end_at'), - ]) + array_merge($input, ['date_range' => $dateRange1]) ); $beforeLedger = $statisticService->ledger( - array_merge($input, [ - 'start_at' => $request->input('before_start_at'), - 'end_at' => $request->input('before_end_at'), - ]) + array_merge($input, ['date_range' => $dateRange2]) ); // 销售涨幅 @@ -124,7 +121,7 @@ class StatisticsController extends Controller DB::raw('SUM(sales) as sales'), DB::raw('SUM(expenditure) as expenditure'), ]) - ->filter($input, LedgerItemFilter::class) + ->filter(array_merge($input, ['date_range' => $dateRange1]), LedgerItemFilter::class) ->whereIn('ledger_item_type_id', $lotteryTypes->pluck('key')) ->groupBy(['ledger_item_type_id']) ->get()