diff --git a/app/Admin/Controllers/v3/OrderReportController.php b/app/Admin/Controllers/v3/OrderReportController.php index b923d1d..ae8807e 100644 --- a/app/Admin/Controllers/v3/OrderReportController.php +++ b/app/Admin/Controllers/v3/OrderReportController.php @@ -33,14 +33,13 @@ class OrderReportController extends AdminController $filter->panel(); $filter->equal('market_id','市场')->select($marketList); - // $filter->equal('start_time','开始时间')->date(); - // $filter->equal('end_time','结束时间')->date(); + $filter->equal('start_time','开始时间')->date(); + $filter->equal('end_time','结束时间')->date(); - $today = date('Y-m-d'); - $monthBefore = date("Y-m-d",strtotime("-1 months",strtotime($today))); - $timeData = $this->periodDateArr($monthBefore,$today); - - $filter->equal('day','日期')->select($timeData)->default($today); + // $today = date('Y-m-d'); + // $monthBefore = date("Y-m-d",strtotime("-1 months",strtotime($today))); + // $timeData = $this->periodDateArr($monthBefore,$today); + // $filter->equal('day','日期')->select($timeData)->default($today); }); // 每页1条 diff --git a/app/Admin/Repositories/v3/OrderReport.php b/app/Admin/Repositories/v3/OrderReport.php index 15b9333..1c2dbe5 100644 --- a/app/Admin/Repositories/v3/OrderReport.php +++ b/app/Admin/Repositories/v3/OrderReport.php @@ -36,11 +36,11 @@ class OrderReport extends EloquentRepository $endTime = request()->input('end_time'); // 日期 - $date = request()->input('day'); - if(!empty($date)){ - $startTime = $date; - $endTime = $date; - } + // $date = request()->input('day'); + // if(!empty($date)){ + // $startTime = $date; + // $endTime = $date; + // } $orderMainOnline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_ONLINE); $orderMainOffline = OrderMainModel::select(DB::raw('COUNT(id) AS total_num, SUM(money) AS total_money'))->whereIn('state',[4,5])->where('type',OrderMainModel::ORDER_TYPE_OFFLINE);