|
@@ -42,15 +42,16 @@ class CallbackLogController extends CatchController
|
|
|
})->when($userRanseStartAtBeginTime, function ($query, $userRanseStartAtBeginTime){
|
|
|
return $query->where('user_ranse_start_at', '>=', $userRanseStartAtBeginTime);
|
|
|
})->when($userRanseStartAtEndTime, function ($query, $userRanseStartAtEndTime){
|
|
|
- return $query->where('user_ranse_start_at', '<=', $userRanseStartAtEndTime);
|
|
|
+ return $query->where('user_ranse_start_at', '<=', $userRanseStartAtEndTime . ' 23:59:59');
|
|
|
})->when($orderCreatedAtBeginTime, function ($query, $orderCreatedAtBeginTime){
|
|
|
return $query->where('order_created_at', '>=', $orderCreatedAtBeginTime);
|
|
|
})->when($miniprogramId, function ($query, $miniprogramId){
|
|
|
return $query->where('miniprogram_id', $miniprogramId);
|
|
|
})
|
|
|
->when($orderCreatedAtEndTime, function ($query, $orderCreatedAtEndTime) {
|
|
|
- return $query->where('order_created_at', '<=', $orderCreatedAtEndTime);
|
|
|
+ return $query->where('order_created_at', '<=', $orderCreatedAtEndTime. ' 23:59:59');
|
|
|
})->orderBy('created_at', 'desc');
|
|
|
+
|
|
|
if($isExport) {
|
|
|
$result = $sql->get();
|
|
|
} else {
|