...
|
...
|
@@ -23,13 +23,13 @@ class StatisticsController extends AdminBaseController |
|
|
$startTime = empty($param['start_time']) ? 0 : strtotime($param['start_time']);
|
|
|
$endTime = empty($param['end_time']) ? 0 : strtotime($param['end_time']);
|
|
|
if (!empty($startTime) && !empty($endTime)) {
|
|
|
$where1['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
|
|
|
$where1['get_time'] = [['>= time', $startTime], ['<= time', $endTime]];
|
|
|
} else {
|
|
|
if (!empty($startTime)) {
|
|
|
$where1['create_time'] = ['>= time', $startTime];
|
|
|
$where1['get_time'] = ['>= time', $startTime];
|
|
|
}
|
|
|
if (!empty($endTime)) {
|
|
|
$where1['create_time'] = ['<= time', $endTime];
|
|
|
$where1['get_time'] = ['<= time', $endTime];
|
|
|
}
|
|
|
}
|
|
|
$logistics_id = empty($param['logistics_id']) ? '' : $param['logistics_id'];
|
...
|
...
|
@@ -184,13 +184,13 @@ class StatisticsController extends AdminBaseController |
|
|
$startTime = empty($param['start_time']) ? 0 : strtotime($param['start_time']);
|
|
|
$endTime = empty($param['end_time']) ? 0 : strtotime($param['end_time']);
|
|
|
if (!empty($startTime) && !empty($endTime)) {
|
|
|
$where1['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
|
|
|
$where1['get_time'] = [['>= time', $startTime], ['<= time', $endTime]];
|
|
|
} else {
|
|
|
if (!empty($startTime)) {
|
|
|
$where1['create_time'] = ['>= time', $startTime];
|
|
|
$where1['get_time'] = ['>= time', $startTime];
|
|
|
}
|
|
|
if (!empty($endTime)) {
|
|
|
$where1['create_time'] = ['<= time', $endTime];
|
|
|
$where1['get_time'] = ['<= time', $endTime];
|
|
|
}
|
|
|
}
|
|
|
$logistics_id = empty($param['logistics_id']) ? '' : $param['logistics_id'];
|
...
|
...
|
|