diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index 6f9049a9..026c4921 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -68,6 +68,11 @@ class StoreOrder extends BaseController [$page, $limit] = $this->getPage(); $where['section_startTime'] = $this->request->param('section_startTime'); $where['section_endTime'] = $this->request->param('section_endTime'); + if(empty($where['section_startTime']) && empty($where['section_endTime'])){ + $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00'; + $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59'; + } + return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId)); } diff --git a/route/api.php b/route/api.php index 836b653e..57416a5b 100644 --- a/route/api.php +++ b/route/api.php @@ -244,6 +244,7 @@ Route::group('api/', function () { Route::post('intention/update/:id', 'api.store.merchant.MerchantIntention/update'); Route::post('store/product/group/cancel', 'api.store.product.StoreProductGroup/cancel'); + Route::get('admin/:merId/expenditure', 'api.server.StoreOrder/expenditure');//商户账单 //客服商品管理 Route::group('server/:merId', function () { //商品 @@ -290,7 +291,6 @@ Route::group('api/', function () { //管理员订单 Route::group('admin/:merId', function () { - Route::get('/expenditure', '/expenditure'); Route::get('/statistics', '/orderStatistics'); Route::get('/order_price', '/orderDetail'); Route::get('/order_list', '/orderList');