pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

员工业绩按付款时间计算

base
Jing Li 2023-11-06 17:17:29 +08:00
parent d6f4079cd4
commit 0e90f3db8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Admin/Controllers/Store/StaffPerformanceController.php
View File

@ -52,11 +52,11 @@ class StaffPerformanceController extends AdminController
]) ])
->when($start || $end, function ($builder) use ($start, $end) { ->when($start || $end, function ($builder) use ($start, $end) {
if ($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)) return $builder->when($start, fn ($builder) => $builder->where('pay_at', '>=', $start))
->when($end, fn ($builder) => $builder->where('created_at', '<=', $end)); ->when($end, fn ($builder) => $builder->where('pay_at', '<=', $end));
}) })
->groupBy('inviter_id'); ->groupBy('inviter_id');
@ -70,11 +70,11 @@ class StaffPerformanceController extends AdminController
->where('status', OfflineOrderStatus::Paid) ->where('status', OfflineOrderStatus::Paid)
->when($start || $end, function ($builder) use ($start, $end) { ->when($start || $end, function ($builder) use ($start, $end) {
if ($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)) return $builder->when($start, fn ($builder) => $builder->where('payment_time', '>=', $start))
->when($end, fn ($builder) => $builder->where('created_at', '<=', $end)); ->when($end, fn ($builder) => $builder->where('payment_time', '<=', $end));
}) })
->groupBy('staff_id'); ->groupBy('staff_id');