From 0e90f3db8db0184b66f1766fa71b136fa3976f2e Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 6 Nov 2023 17:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=B8=9A=E7=BB=A9=E6=8C=89?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Store/StaffPerformanceController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Admin/Controllers/Store/StaffPerformanceController.php b/app/Admin/Controllers/Store/StaffPerformanceController.php index 0cca006a..c1a17410 100644 --- a/app/Admin/Controllers/Store/StaffPerformanceController.php +++ b/app/Admin/Controllers/Store/StaffPerformanceController.php @@ -52,11 +52,11 @@ class StaffPerformanceController extends AdminController ]) ->when($start || $end, function ($builder) use ($start, $end) { if ($start && $end) { - return $builder->whereBetween('created_at', [$start, $end]); + return $builder->whereBetween('pay_at', [$start, $end]); } - return $builder->when($start, fn ($builder) => $builder->where('created_at', '>=', $start)) - ->when($end, fn ($builder) => $builder->where('created_at', '<=', $end)); + return $builder->when($start, fn ($builder) => $builder->where('pay_at', '>=', $start)) + ->when($end, fn ($builder) => $builder->where('pay_at', '<=', $end)); }) ->groupBy('inviter_id'); @@ -70,11 +70,11 @@ class StaffPerformanceController extends AdminController ->where('status', OfflineOrderStatus::Paid) ->when($start || $end, function ($builder) use ($start, $end) { if ($start && $end) { - return $builder->whereBetween('created_at', [$start, $end]); + return $builder->whereBetween('payment_time', [$start, $end]); } - return $builder->when($start, fn ($builder) => $builder->where('created_at', '>=', $start)) - ->when($end, fn ($builder) => $builder->where('created_at', '<=', $end)); + return $builder->when($start, fn ($builder) => $builder->where('payment_time', '>=', $start)) + ->when($end, fn ($builder) => $builder->where('payment_time', '<=', $end)); }) ->groupBy('staff_id');