From e2ea5cb92edf43bbfac88fea307b44a539768754 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 23 Nov 2020 15:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E4=B8=8D=E5=8F=91=E9=85=8D?= =?UTF-8?q?=E9=80=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/MiniprogramService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Service/v3/Implementations/MiniprogramService.php b/app/Service/v3/Implementations/MiniprogramService.php index a51d00c..4eca455 100644 --- a/app/Service/v3/Implementations/MiniprogramService.php +++ b/app/Service/v3/Implementations/MiniprogramService.php @@ -5,6 +5,7 @@ namespace App\Service\v3\Implementations; use App\Commons\Log; use App\Constants\v3\Employee; use App\Constants\v3\Payment; +use App\Constants\v3\Shipping; use App\Model\v3\Employees; use App\Model\v3\Order; use App\Model\v3\OrderGoods; @@ -242,7 +243,7 @@ class MiniprogramService implements MiniprogramServiceInterface { // 主订单信息 $orderMain = OrderMain::query()->where(['global_order_id' => $globalOrderId])->first(); - if (!$orderMain) { + if (!$orderMain || $orderMain->shipping_type == Shipping::TYPE_SELF_TAKE) { return false; } @@ -320,7 +321,7 @@ class MiniprogramService implements MiniprogramServiceInterface if (!($orderMain instanceof OrderMain)) { $orderMain = OrderMain::query()->where(['global_order_id' => $orderMain])->first(); } - if (!$orderMain) { + if (!$orderMain || $orderMain->shipping_type == Shipping::TYPE_SELF_TAKE) { return false; }