Merge branch 'master' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf

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;
         }