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');