From 79b85b7e221da0c731d21dced1f7289ef7cbd85d Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 15 Dec 2021 00:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= 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 506d61b93..36634c345 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']) && in_array($data['order_model'], [0,2]))) ? 1 : 0; + $result['is_delivery'] = ($data['status'] == 2 && (isset($data['order_model']) && in_array($data['order_model'], [0,2,3]))) ? 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