mkm/shop-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev

Browse Source
This commit is contained in:
luofei 2024-03-13 15:03:32 +08:00
commit 881759cc18
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controller/api/server/StoreOrder.php
View File

@ -68,6 +68,11 @@ class StoreOrder extends BaseController
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where['section_startTime'] = $this->request->param('section_startTime'); $where['section_startTime'] = $this->request->param('section_startTime');
$where['section_endTime'] = $this->request->param('section_endTime'); $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)); return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId));
} }

2
route/api.php
View File

@ -244,6 +244,7 @@ Route::group('api/', function () {
Route::post('intention/update/:id', 'api.store.merchant.MerchantIntention/update'); Route::post('intention/update/:id', 'api.store.merchant.MerchantIntention/update');
Route::post('store/product/group/cancel', 'api.store.product.StoreProductGroup/cancel'); 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 () { Route::group('server/:merId', function () {
//商品 //商品
@ -290,7 +291,6 @@ Route::group('api/', function () {
//管理员订单 //管理员订单
Route::group('admin/:merId', function () { Route::group('admin/:merId', function () {
Route::get('/expenditure', '/expenditure');
Route::get('/statistics', '/orderStatistics'); Route::get('/statistics', '/orderStatistics');
Route::get('/order_price', '/orderDetail'); Route::get('/order_price', '/orderDetail');
Route::get('/order_list', '/orderList'); Route::get('/order_list', '/orderList');