From b77c436583300be113aca3b6ff394f8f43fe1099 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 14 Dec 2021 18:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8F=91=E8=B4=A7=E6=8C=89=E9=92=AE=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/OrderService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/service/OrderService.php b/app/service/OrderService.php index f62172467..506d61b93 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -1449,7 +1449,7 @@ class OrderService { $result['is_confirm'] = ($data['status'] == 0) ? 1 : 0; $result['is_pay'] = ($data['pay_status'] == 0 && !in_array($data['status'], [5,6])) ? 1 : 0; - $result['is_delivery'] = ($data['status'] == 2 || (isset($data['order_model']) && $data['order_model'] == 3)) ? 1 : 0; + $result['is_delivery'] = ($data['status'] == 2 && (isset($data['order_model']) && in_array($data['order_model'], [0,2]))) ? 1 : 0; $result['is_collect'] = ($data['status'] == 3) ? 1 : 0; $result['is_cancel'] = (in_array($data['status'], [0,1]) || (in_array($data['status'], [2,3,4]) && $data['pay_status'] == 0)) ? 1 : 0; $result['is_delete'] = (in_array($data['status'], [5,6]) && isset($data['is_delete_time']) && $data['is_delete_time'] == 0) ? 1 : 0; -- GitLab