优化管理津贴流水
parent
433692d6a0
commit
9c48f1bb91
|
|
@ -18,30 +18,25 @@ class ManageSubsidyLogController extends Controller
|
|||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$isComplted = (bool) $request->input('is_completed');
|
||||
|
||||
$perPage = Paginator::resolvePerPage('per_page', 20, 50);
|
||||
|
||||
$tz = now();
|
||||
|
||||
if ($tz->day >= 20) {
|
||||
// 结算当月20号开始的管理津贴
|
||||
$startAt = $tz->copy()->setDay(20)->startOfDay();
|
||||
} elseif ($tz->day >= 5) {
|
||||
// 结算当月5号开始的管理津贴
|
||||
$startAt = $tz->copy()->setDay(5)->startOfDay();
|
||||
} else {
|
||||
// 结算上月20号开始的管理津贴
|
||||
$startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay();
|
||||
}
|
||||
|
||||
$manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order.user'])
|
||||
->when($isComplted, function ($query) {
|
||||
$tz = now();
|
||||
|
||||
if ($tz->day >= 20) {
|
||||
// 结算当月20号开始的管理津贴
|
||||
$startAt = $tz->copy()->setDay(20)->startOfDay();
|
||||
} elseif ($tz->day >= 5) {
|
||||
// 结算当月5号开始的管理津贴
|
||||
$startAt = $tz->copy()->setDay(5)->startOfDay();
|
||||
} else {
|
||||
// 结算上月20号开始的管理津贴
|
||||
$startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay();
|
||||
}
|
||||
|
||||
$query->where('order_completed_at', '>=', $startAt)->latest('order_completed_at');
|
||||
}, function ($query) {
|
||||
$query->whereNull('order_completed_at')->latest('id');
|
||||
})
|
||||
->where('order_completed_at', '>=', $startAt)
|
||||
->where('user_id', $request->user()->id)
|
||||
->latest('order_completed_at')
|
||||
->simplePaginate($perPage);
|
||||
|
||||
return DealerManageSubsidyLogResource::collection($manageSubsidyLogs);
|
||||
|
|
|
|||
Loading…
Reference in New Issue