|
@@ -211,17 +211,21 @@ class LandingPageLinkService
|
|
|
if (isset($params['user_begin_time']) || isset($params['user_end_time'])) {
|
|
|
$sql->join('users','users.id','orders.uid');
|
|
|
if (isset($params['user_begin_time']) && $params['user_begin_time']) {
|
|
|
- $sql->where('users.created_at', '>=', $params['user_begin_time']);
|
|
|
+ $date = substr($params['user_begin_time'],0,10);
|
|
|
+ $sql->where('users.created_at', '>=', $date. ' 00:00:00');
|
|
|
}
|
|
|
if (isset($params['user_end_time']) && $params['user_end_time']) {
|
|
|
- $sql->where('users.created_at', '<=', $params['user_end_time']);
|
|
|
+ $date = substr($params['user_end_time'],0,10);
|
|
|
+ $sql->where('users.created_at', '<=', $date. ' 23:59:59');
|
|
|
}
|
|
|
}
|
|
|
if (isset($params['begin_time']) && $params['begin_time']) {
|
|
|
- $sql->where('orders.created_at', '>=', $params['begin_time']);
|
|
|
+ $date = substr($params['begin_time'],0,10);
|
|
|
+ $sql->where('orders.created_at', '>=', $date. ' 00:00:00');
|
|
|
}
|
|
|
if (isset($params['end_time']) && $params['begin_time']) {
|
|
|
- $sql->where('orders.created_at', '<=', $params['end_time']);
|
|
|
+ $date = substr($params['end_time'],0,10);
|
|
|
+ $sql->where('orders.created_at', '<=', $date. ' 23:59:59';
|
|
|
}
|
|
|
if (isset($params['uid']) && $params['uid']) {
|
|
|
$sql->where('orders.uid', $params['uid']);
|