From bda10fdbc1f9156e5d6670177e70fdcfe4e4c2e0 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 10 Apr 2023 14:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E5=AE=9A=E4=B8=8D?=
 =?UTF-8?q?=E9=80=81=E8=BE=BE=E5=85=B3=E9=97=AD=E5=90=8E=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreCartServices.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/services/order/StoreCartServices.php b/crmeb/app/services/order/StoreCartServices.php
index 34275c1da..d00842ef8 100644
--- a/crmeb/app/services/order/StoreCartServices.php
+++ b/crmeb/app/services/order/StoreCartServices.php
@@ -16,6 +16,7 @@ use app\services\activity\advance\StoreAdvanceServices;
 use app\services\BaseServices;
 use app\dao\order\StoreCartDao;
 use app\services\activity\coupon\StoreCouponIssueServices;
+use app\services\product\shipping\ShippingTemplatesServices;
 use app\services\shipping\ShippingTemplatesNoDeliveryServices;
 use app\services\system\SystemUserLevelServices;
 use app\services\user\member\MemberCardServices;
@@ -584,9 +585,14 @@ class StoreCartServices extends BaseServices
                 foreach ($cartList as $item) {
                     $tempIds[] = $item['productInfo']['temp_id'];
                 }
-                /** @var ShippingTemplatesNoDeliveryServices $noDeliveryServices */
-                $noDeliveryServices = app()->make(ShippingTemplatesNoDeliveryServices::class);
-                $tempIds = $noDeliveryServices->isNoDelivery(array_unique($tempIds), $cityId);
+                $tempIds = array_unique($tempIds);
+                $shippingService = app()->make(\app\services\shipping\ShippingTemplatesServices::class);
+                $tempIds = $shippingService->getColumn([['id', 'in', $tempIds], ['no_delivery', '=', 1]], 'id');
+                if ($tempIds) {
+                    /** @var ShippingTemplatesNoDeliveryServices $noDeliveryServices */
+                    $noDeliveryServices = app()->make(ShippingTemplatesNoDeliveryServices::class);
+                    $tempIds = $noDeliveryServices->isNoDelivery(array_unique($tempIds), $cityId);
+                }
             }
         }