From 435de64a031033434aded8e845b03ef8188ce935 Mon Sep 17 00:00:00 2001 From: liapples Date: Sat, 16 Oct 2021 11:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E9=87=91=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FinanceStatisticsController.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/AdminSupplier/Controllers/FinanceStatisticsController.php b/app/AdminSupplier/Controllers/FinanceStatisticsController.php index b961629..da2206b 100755 --- a/app/AdminSupplier/Controllers/FinanceStatisticsController.php +++ b/app/AdminSupplier/Controllers/FinanceStatisticsController.php @@ -53,6 +53,9 @@ class FinanceStatisticsController extends AdminController $dateTime = request('created_at', 0); if ($dateTime) { + if (empty($dateTime['end'])) { + $dateTime['end'] = date('Y-m-d'); + } $price->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']); //$costPrice->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']) $count->whereBetween('created_at',[$dateTime['start'] . ' 00:00:00',$dateTime['end'].' 23:59:59']); @@ -85,8 +88,7 @@ class FinanceStatisticsController extends AdminController }); }) - ->body(function (Row $row) use ($price, $profit, $count,$onlinePrice) { - + ->body(function (Row $row) use ($price, $dateTime, $count, $onlinePrice) { $row->column(3, function (Column $column) use ($onlinePrice) { $column->row(Card::make('线上金额', function () use ($onlinePrice) { @@ -108,9 +110,14 @@ HTML; })); }); - $row->column(3, function (Column $column) use ($profit) { - $column->row(Card::make('交易费', function () use ($profit) { - $price = DepositLog::where('supplier_id', Admin::user()->id)->sum('price'); + $row->column(3, function (Column $column) use ($dateTime) { + $column->row(Card::make('交易费', function () use ($dateTime) { + if ($dateTime) { + $price = DepositLog::whereBetween('created_at', [$dateTime['start'], $dateTime['end'] . ' 23:59:59']) + ->where('supplier_id', Admin::user()->id)->sum('price'); + } else { + $price = DepositLog::where('supplier_id', Admin::user()->id)->sum('price'); + } return <<

$price