From dc789c2f5e38c2d82180900d5fe0bee2f4ceaa5b Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Thu, 6 Jun 2024 15:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/lists/store_order/StoreOrderLists.php | 2 +- app/store/controller/store_order/StoreOrderController.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 167f2dbf9..15f637369 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -28,7 +28,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['order_id', 'pay_type', 'status', 'staff_id'], + '=' => ['order_id', 'pay_type', 'status', 'staff_id', 'shipping_type'], ]; } diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 1bedb5d45..e0f0e85f9 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -30,7 +30,8 @@ class StoreOrderController extends BaseAdminController ApiDoc\Author('中国队长'), ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'pay_type', type: 'int', require: false, desc: '支付方式'), + ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式：1配送订单，2核销订单，3收银台订单'), ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态：0待发货，1待收货，2已完成'),