From 8826d9b0d29c10e80e8c0bcabdf6d5e9a452c79a Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 25 Aug 2023 10:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/order/StoreOrder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 377221dd..a7d17864 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -101,10 +101,11 @@ class StoreOrder extends BaseController
             return app('json')->fail('数据无效');
 
         if ($addressId) {
+            $deliveryWay = !empty($takes[0]) ? $takes[0] : 0;
             $addressRepository = app()->make(UserAddressRepository::class);
             $address = $addressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
             $cartProductType = Db::name('StoreCart')->where('cart_id', $cartId[0] ?? 0)->value('product_type');
-            if ($cartProductType == 0) {
+            if ($cartProductType == 0 && $deliveryWay != 1) {
                 $userAddressCode = ($address['province_code'] ?? '') . ',' . ($address['city_code'] ?? '') . ',' . ($address['district_code'] ?? '') . ',' . ($address['street_code'] ?? '') . ',' . ($address['village_code'] ?? '') . ',' . ($address['brigade_id'] ?? 0);
                 $getUrl = env('LOGISTICS_HOST_URL') . '/api/hasCourier?user_address_code=' . $userAddressCode;
                 $ch = curl_init();