From 1047347491746bc7a0bc0fc6c027afc569846b90 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 21 Aug 2023 18:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=BA=E5=9F=9F=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E5=91=98=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/StoreOrderCreateRepository.php      | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index bbf0fac2..310fc566 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -43,20 +43,23 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         if ($addressId) {
             $addressRepository = app()->make(UserAddressRepository::class);
             $address = $addressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
-            $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();
-            curl_setopt($ch, CURLOPT_URL, $getUrl);
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 2);
-            $hasCourierData = curl_exec($ch);
-            curl_close($ch);
-            if (!empty($hasCourierData) && is_string($hasCourierData)) {
-                $courierData = json_decode($hasCourierData, true);
-                if (empty($courierData['code']) || $courierData['code'] != 1) {
-                    throw new ValidateException('该收货区域未配送快递员');
-                } 
+            $cartProductType = Db::name('StoreCart')->where('cart_id', $cartId[0] ?? 0)->value('product_type');
+            if ($cartProductType == 0) {
+                $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();
+                curl_setopt($ch, CURLOPT_URL, $getUrl);
+                curl_setopt($ch, CURLOPT_HEADER, 0);
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                curl_setopt($ch, CURLOPT_TIMEOUT, 2);
+                $hasCourierData = curl_exec($ch);
+                curl_close($ch);
+                if (!empty($hasCourierData) && is_string($hasCourierData)) {
+                    $courierData = json_decode($hasCourierData, true);
+                    if (empty($courierData['code']) || $courierData['code'] != 1) {
+                        throw new ValidateException('该收货区域未配送快递员');
+                    } 
+                }
             }
         }
         $storeCartRepository = app()->make(StoreCartRepository::class);