更新代发订单
This commit is contained in:
parent
55384b2c45
commit
5f85541795
@ -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;
|
@ -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)
|
||||||
|
@ -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,
|
||||||
@ -106,25 +105,25 @@ Route::group(function () {
|
|||||||
Route::post('delete/:id', 'Order/delete')->name('merchantStoreOrderDelete')->option([
|
Route::post('delete/:id', 'Order/delete')->name('merchantStoreOrderDelete')->option([
|
||||||
'_alias' => '删除',
|
'_alias' => '删除',
|
||||||
]);
|
]);
|
||||||
Route::get('children/:id', 'Order/childrenList')->name('merchantStoreOrderChildrenList')->option([
|
Route::get('children/:id', 'Order/childrenList')->name('merchantStoreOrderChildrenList')->option([
|
||||||
'_alias' => '关联订单',
|
'_alias' => '关联订单',
|
||||||
]);
|
]);
|
||||||
Route::get('logistics_code/:id', 'Order/logisticsCode')->name('merchantStoreOrderLogisticsCode')->option([
|
Route::get('logistics_code/:id', 'Order/logisticsCode')->name('merchantStoreOrderLogisticsCode')->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,
|
||||||
],
|
],
|
||||||
@ -158,7 +157,7 @@ Route::group(function () {
|
|||||||
Route::post('delivery/:id', 'OrderOther/delivery')->option([
|
Route::post('delivery/:id', 'OrderOther/delivery')->option([
|
||||||
'_alias' => '发货',
|
'_alias' => '发货',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Route::get('title', 'OrderOther/title')->option([
|
Route::get('title', 'OrderOther/title')->option([
|
||||||
'_alias' => '头部统计',
|
'_alias' => '头部统计',
|
||||||
]);
|
]);
|
||||||
@ -189,23 +188,22 @@ Route::group(function () {
|
|||||||
Route::post('delete/:id', 'OrderOther/delete')->option([
|
Route::post('delete/:id', 'OrderOther/delete')->option([
|
||||||
'_alias' => '删除',
|
'_alias' => '删除',
|
||||||
]);
|
]);
|
||||||
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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user