From a2bb594a15a28c3ef94972e0ee7715cb8731fc11 Mon Sep 17 00:00:00 2001 From: yin5th <541304803@qq.com> Date: Wed, 27 Sep 2023 17:48:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/app/admin/logic/order/OrderLogic.php | 5 +++++ server/app/admin/view/order/order/lists.html | 12 ++++++++++++ server/app/common/model/Client_.php | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/server/app/admin/logic/order/OrderLogic.php b/server/app/admin/logic/order/OrderLogic.php index c8085360..c6396216 100644 --- a/server/app/admin/logic/order/OrderLogic.php +++ b/server/app/admin/logic/order/OrderLogic.php @@ -144,6 +144,11 @@ class OrderLogic extends Logic $where[] = ['o.is_frontend', '=', $get['is_frontend']]; } + // 第三方api订单 + if (isset($get['is_api']) && $get['is_api'] != '') { + $where[] = ['o.is_api', '=', $get['is_api']]; + } + //订单来源 if (isset($get['order_source']) && $get['order_source'] != '') { $where[] = ['o.order_source', '=', $get['order_source']]; diff --git a/server/app/admin/view/order/order/lists.html b/server/app/admin/view/order/order/lists.html index a9c3a38e..29848a2a 100644 --- a/server/app/admin/view/order/order/lists.html +++ b/server/app/admin/view/order/order/lists.html @@ -41,6 +41,7 @@
*会员商城下单列表。
*订单状态有待付款,待发货,待收货,已完成,已关闭。
*待付款订单取消后则为已关闭。待付款订单支付后则为待发货。待发货订单发货后则为待收货。待收货订单收货后则为已完成。
+*API订单表示是第三方团队通过API生成的订单
@@ -142,6 +143,17 @@ +