From 5f855417952ad6f885e68a303f7e6082facd1d0a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 19 Jan 2024 13:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E5=8F=91=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store}/order/StoreOrderBehalf.php | 4 +- route/admin/order.php | 8 --- route/merchant/order.php | 72 ++++++++++--------- 3 files changed, 41 insertions(+), 43 deletions(-) rename app/controller/{admin => merchant/store}/order/StoreOrderBehalf.php (97%) diff --git a/app/controller/admin/order/StoreOrderBehalf.php b/app/controller/merchant/store/order/StoreOrderBehalf.php similarity index 97% rename from app/controller/admin/order/StoreOrderBehalf.php rename to app/controller/merchant/store/order/StoreOrderBehalf.php index a066a4ab..5a6c3953 100644 --- a/app/controller/admin/order/StoreOrderBehalf.php +++ b/app/controller/merchant/store/order/StoreOrderBehalf.php @@ -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) { $where['order_id'] = $column; + }else{ + return app('json')->success([]); } if ($status == 0) { $where['status'] = 2; diff --git a/route/admin/order.php b/route/admin/order.php index ec95ef10..7f2349ba 100644 --- a/route/admin/order.php +++ b/route/admin/order.php @@ -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(AdminTokenMiddleware::class, true) ->middleware(AdminAuthMiddleware::class) diff --git a/route/merchant/order.php b/route/merchant/order.php index ce3d18f3..c802363c 100644 --- a/route/merchant/order.php +++ b/route/merchant/order.php @@ -18,15 +18,14 @@ use app\common\middleware\MerchantCheckBaseInfoMiddleware; 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' => '预览', ]); - Route::get('/dump_lst','/dumpLst')->name('merchantServeExportDumpLst')->option([ + Route::get('/dump_lst', '/dumpLst')->name('merchantServeExportDumpLst')->option([ '_alias' => '默认模板', ]); - })->prefix('admin.system.serve.Export')->option([ '_path' => '/order/list', '_auth' => true, @@ -106,25 +105,25 @@ Route::group(function () { Route::post('delete/:id', 'Order/delete')->name('merchantStoreOrderDelete')->option([ '_alias' => '删除', ]); - Route::get('children/:id', 'Order/childrenList')->name('merchantStoreOrderChildrenList')->option([ - '_alias' => '关联订单', - ]); - Route::get('logistics_code/:id', 'Order/logisticsCode')->name('merchantStoreOrderLogisticsCode')->option([ + Route::get('children/:id', 'Order/childrenList')->name('merchantStoreOrderChildrenList')->option([ + '_alias' => '关联订单', + ]); + Route::get('logistics_code/:id', 'Order/logisticsCode')->name('merchantStoreOrderLogisticsCode')->option([ '_alias' => '生成取货码', ]); })->prefix('merchant.store.order.')->option([ '_path' => '/order/list', '_auth' => true, - '_append'=> [ + '_append' => [ [ - '_name' =>'merchantStoreExcelLst', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelLst', + '_path' => '/order/list', '_alias' => '导出列表', '_auth' => true, ], [ - '_name' =>'merchantStoreExcelDownload', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelDownload', + '_path' => '/order/list', '_alias' => '导出下载', '_auth' => true, ], @@ -158,7 +157,7 @@ Route::group(function () { Route::post('delivery/:id', 'OrderOther/delivery')->option([ '_alias' => '发货', ]); - + Route::get('title', 'OrderOther/title')->option([ '_alias' => '头部统计', ]); @@ -189,23 +188,22 @@ Route::group(function () { Route::post('delete/:id', 'OrderOther/delete')->option([ '_alias' => '删除', ]); - Route::get('children/:id', 'OrderOther/childrenList')->option([ - '_alias' => '关联订单', - ]); - + Route::get('children/:id', 'OrderOther/childrenList')->option([ + '_alias' => '关联订单', + ]); })->prefix('merchant.store.order.')->option([ '_path' => '/order/list', '_auth' => true, - '_append'=> [ + '_append' => [ [ - '_name' =>'merchantStoreExcelLst', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelLst', + '_path' => '/order/list', '_alias' => '导出列表', '_auth' => true, ], [ - '_name' =>'merchantStoreExcelDownload', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelDownload', + '_path' => '/order/list', '_alias' => '导出下载', '_auth' => true, ], @@ -271,16 +269,16 @@ Route::group(function () { })->prefix('merchant.store.order.RefundOrder')->option([ '_path' => '/order/refund', '_auth' => true, - '_append'=> [ + '_append' => [ [ - '_name' =>'merchantStoreExcelLst', - '_path' =>'/order/refund', + '_name' => 'merchantStoreExcelLst', + '_path' => '/order/refund', '_alias' => '导出列表', '_auth' => true, ], [ - '_name' =>'merchantStoreExcelDownload', - '_path' =>'/order/refund', + '_name' => 'merchantStoreExcelDownload', + '_path' => '/order/refund', '_alias' => '导出下载', '_auth' => true, ], @@ -305,16 +303,16 @@ Route::group(function () { })->prefix('merchant.store.')->option([ '_path' => '/order/list', '_auth' => true, - '_append'=> [ + '_append' => [ [ - '_name' =>'merchantStoreExcelLst', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelLst', + '_path' => '/order/list', '_alias' => '导出列表', '_auth' => true, ], [ - '_name' =>'merchantStoreExcelDownload', - '_path' =>'/order/list', + '_name' => 'merchantStoreExcelDownload', + '_path' => '/order/list', '_alias' => '导出下载', '_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(MerchantTokenMiddleware::class, true) ->middleware(MerchantAuthMiddleware::class)