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

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

Browse Source
This commit is contained in:
luofei 2024-01-19 14:43:39 +08:00
commit afe7e89d02
3 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/admin/order/StoreOrderBehalf.php → app/controller/merchant/store/order/StoreOrderBehalf.php
View File

@ -11,7 +11,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\controller\admin\store\order; namespace app\controller\merchant\store\order;
@ -75,6 +75,8 @@ class StoreOrderBehalf extends BaseController
} }
if ($column) { if ($column) {
$where['order_id'] = $column; $where['order_id'] = $column;
}else{
return app('json')->success([]);
} }
if ($status == 0) { if ($status == 0) {
$where['status'] = 2; $where['status'] = 2;

8
route/admin/order.php
View File

@ -150,14 +150,6 @@ Route::group(function () {
] ]
]); ]);
//代发货订单
Route::group('behalf_admin', function () {
Route::get('/order_list', '/lst');
Route::get('/code', '/logisticsCode');
Route::get('/number', '/number');
Route::post('/status', '/status');
})->prefix('admin.order.StoreOrderBehalf');
})->middleware(AllowOriginMiddleware::class) })->middleware(AllowOriginMiddleware::class)
->middleware(AdminTokenMiddleware::class, true) ->middleware(AdminTokenMiddleware::class, true)
->middleware(AdminAuthMiddleware::class) ->middleware(AdminAuthMiddleware::class)

56
route/merchant/order.php
View File

@ -18,15 +18,14 @@ use app\common\middleware\MerchantCheckBaseInfoMiddleware;
Route::group(function () { Route::group(function () {
//电子面单 //电子面单
Route::group('expr',function(){ Route::group('expr', function () {
Route::get('/temps','/getExportTemp')->name('merchantServeExportTemps')->option([ Route::get('/temps', '/getExportTemp')->name('merchantServeExportTemps')->option([
'_alias' => '预览', '_alias' => '预览',
]); ]);
Route::get('/dump_lst','/dumpLst')->name('merchantServeExportDumpLst')->option([ Route::get('/dump_lst', '/dumpLst')->name('merchantServeExportDumpLst')->option([
'_alias' => '默认模板', '_alias' => '默认模板',
]); ]);
})->prefix('admin.system.serve.Export')->option([ })->prefix('admin.system.serve.Export')->option([
'_path' => '/order/list', '_path' => '/order/list',
'_auth' => true, '_auth' => true,
@ -115,16 +114,16 @@ Route::group(function () {
})->prefix('merchant.store.order.')->option([ })->prefix('merchant.store.order.')->option([
'_path' => '/order/list', '_path' => '/order/list',
'_auth' => true, '_auth' => true,
'_append'=> [ '_append' => [
[ [
'_name' =>'merchantStoreExcelLst', '_name' => 'merchantStoreExcelLst',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出列表', '_alias' => '导出列表',
'_auth' => true, '_auth' => true,
], ],
[ [
'_name' =>'merchantStoreExcelDownload', '_name' => 'merchantStoreExcelDownload',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出下载', '_alias' => '导出下载',
'_auth' => true, '_auth' => true,
], ],
@ -192,20 +191,19 @@ Route::group(function () {
Route::get('children/:id', 'OrderOther/childrenList')->option([ Route::get('children/:id', 'OrderOther/childrenList')->option([
'_alias' => '关联订单', '_alias' => '关联订单',
]); ]);
})->prefix('merchant.store.order.')->option([ })->prefix('merchant.store.order.')->option([
'_path' => '/order/list', '_path' => '/order/list',
'_auth' => true, '_auth' => true,
'_append'=> [ '_append' => [
[ [
'_name' =>'merchantStoreExcelLst', '_name' => 'merchantStoreExcelLst',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出列表', '_alias' => '导出列表',
'_auth' => true, '_auth' => true,
], ],
[ [
'_name' =>'merchantStoreExcelDownload', '_name' => 'merchantStoreExcelDownload',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出下载', '_alias' => '导出下载',
'_auth' => true, '_auth' => true,
], ],
@ -271,16 +269,16 @@ Route::group(function () {
})->prefix('merchant.store.order.RefundOrder')->option([ })->prefix('merchant.store.order.RefundOrder')->option([
'_path' => '/order/refund', '_path' => '/order/refund',
'_auth' => true, '_auth' => true,
'_append'=> [ '_append' => [
[ [
'_name' =>'merchantStoreExcelLst', '_name' => 'merchantStoreExcelLst',
'_path' =>'/order/refund', '_path' => '/order/refund',
'_alias' => '导出列表', '_alias' => '导出列表',
'_auth' => true, '_auth' => true,
], ],
[ [
'_name' =>'merchantStoreExcelDownload', '_name' => 'merchantStoreExcelDownload',
'_path' =>'/order/refund', '_path' => '/order/refund',
'_alias' => '导出下载', '_alias' => '导出下载',
'_auth' => true, '_auth' => true,
], ],
@ -305,16 +303,16 @@ Route::group(function () {
})->prefix('merchant.store.')->option([ })->prefix('merchant.store.')->option([
'_path' => '/order/list', '_path' => '/order/list',
'_auth' => true, '_auth' => true,
'_append'=> [ '_append' => [
[ [
'_name' =>'merchantStoreExcelLst', '_name' => 'merchantStoreExcelLst',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出列表', '_alias' => '导出列表',
'_auth' => true, '_auth' => true,
], ],
[ [
'_name' =>'merchantStoreExcelDownload', '_name' => 'merchantStoreExcelDownload',
'_path' =>'/order/list', '_path' => '/order/list',
'_alias' => '导出下载', '_alias' => '导出下载',
'_auth' => true, '_auth' => true,
], ],
@ -322,7 +320,13 @@ Route::group(function () {
] ]
]); ]);
//代发货订单
Route::group('store/behalf_admin', function () {
Route::get('/order_list', '/lst');
Route::get('/code', '/logisticsCode');
Route::get('/number', '/number');
Route::post('/status', '/status');
})->prefix('merchant.store.order.StoreOrderBehalf');
})->middleware(AllowOriginMiddleware::class) })->middleware(AllowOriginMiddleware::class)
->middleware(MerchantTokenMiddleware::class, true) ->middleware(MerchantTokenMiddleware::class, true)
->middleware(MerchantAuthMiddleware::class) ->middleware(MerchantAuthMiddleware::class)