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

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;

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)

route/merchant/order.php

@@ -26,7 +26,6 @@ Route::group(function () {
         Route::get('/dump_lst', '/dumpLst')->name('merchantServeExportDumpLst')->option([
             '_alias' => '默认模板',
         ]);
-
     })->prefix('admin.system.serve.Export')->option([
         '_path' => '/order/list',
         '_auth' => true,
@@ -192,7 +191,6 @@ Route::group(function () {
         Route::get('children/:id', 'OrderOther/childrenList')->option([
             '_alias' => '关联订单',
         ]);
-
     })->prefix('merchant.store.order.')->option([
         '_path' => '/order/list',
         '_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)