diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 09ae3cc7..82d04d42 100755 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -495,4 +495,34 @@ class Order extends BaseController return app('json')->success(compact('count', 'list')); } + // 核销订单 + public function takeOrderList(StoreOrderRepository $repository, StoreOrderDao $dao) + { + [$page, $limit] = $this->getPage(); + $where = $this->request->params(['date','order_sn','keywords','username','is_trader']); + $where['take_order'] = 1; + $where['status'] = ''; + $where['verify_date'] = $where['date']; + unset($where['date']); + $status = $where['status']; + unset($where['status']); + $query = $dao->search($where, null)->where($repository->getOrderType($status)); + $count = $query->count(); + $list = $query->page($page, $limit)->select(); + return app('json')->success(compact('count', 'list')); + } + + public function takeOrderCountTitle(StoreOrderRepository $repository) + { + $where = $this->request->params(['date','order_sn','keywords','username','is_trader']); + $where['take_order'] = 1; + $where['status'] = ''; + $where['verify_date'] = $where['date']; + unset($where['date']); + $data[0] = $repository->getStat($where, '')[0]; + $data[1] = $repository->getStat($where, '')[1]; + $data[2] = $repository->getStat($where, '')[2]; + return app('json')->success($data); + } + } \ No newline at end of file diff --git a/route/api.php b/route/api.php index d9fcf441..6b172c12 100644 --- a/route/api.php +++ b/route/api.php @@ -739,6 +739,8 @@ Route::group('api/', function () { Route::get('order_list', 'Order/orderList'); Route::get('order_list_count_title', 'Order/orderCountTitle'); Route::get('refund_order_list', 'Order/refundOrderList'); + Route::get('take_order_list', 'Order/takeOrderList'); + Route::get('take_order_count_title', 'Order/takeOrderCountTitle'); // api.dataview.User Route::get('user_merchat_count', 'User/userMerchantCount');