|
|
@@ -422,10 +422,8 @@ class StatisticsService extends Service
|
|
|
->select($field)
|
|
|
->orderby('order_time', 'desc');
|
|
|
if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
|
|
|
- list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
|
- if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
|
- $start_time = strtotime(date("Y-m-01",$start_time));
|
|
|
- $end_time = strtotime(date("Y-m-01",$end_time));
|
|
|
+ $start_time = strtotime($data['order_time'][0] . "-01");
|
|
|
+ $end_time = strtotime($data['order_time'][1] . "-01");
|
|
|
$model->where('order_time', '>=', $start_time)
|
|
|
->where('order_time', '<=', $end_time);
|
|
|
}
|
cqp