diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index 44ec378fc..a33469285 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -33,7 +33,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte public function setSearch(): array { return [ - '=' => ['store_id', 'paid', 'status', 'order_type'], + '=' => ['store_id', 'paid', 'status', 'order_type', 'admin_id'], '%like' => ['order_id','order_sn'], '%like%' => ['mark'], 'between_time' => 'create_time' diff --git a/app/store/controller/beforehand_order/BeforehandOrderController.php b/app/store/controller/beforehand_order/BeforehandOrderController.php index 2ef17978b..9f5002491 100644 --- a/app/store/controller/beforehand_order/BeforehandOrderController.php +++ b/app/store/controller/beforehand_order/BeforehandOrderController.php @@ -2,6 +2,9 @@ namespace app\store\controller\beforehand_order; +use app\admin\lists\store_product\StoreProductLists; +use app\admin\logic\store_product\StoreProductLogic; +use app\admin\validate\store_product\StoreProductValidate; use app\store\controller\BaseAdminController; use app\admin\lists\beforehand_order\BeforehandOrderLists; use app\admin\lists\beforehand_order\BeforehandOrderTwoLists; @@ -36,6 +39,7 @@ class BeforehandOrderController extends BaseAdminController { $params = $this->request->get(); $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + $params['admin_id'] = $this->request->adminInfo['admin_id'] ?? 0; $this->request->setGet($params); return $this->dataLists(new BeforehandOrderLists()); } @@ -308,4 +312,17 @@ class BeforehandOrderController extends BaseAdminController $file_path = BeforehandOrderLogic::ReturnSupplier($params); return $this->success('导出成功', ['url' => $file_path]); } + + public function productLists() + { + return $this->dataLists(new StoreProductLists()); + } + + public function productDetail() + { + $params = (new StoreProductValidate())->goCheck('detail'); + $result = StoreProductLogic::detail($params); + return $this->data($result); + } + }