From 60e947ada634b85f65b0fdad7769433c152aa7ab Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 24 Jan 2024 15:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=A8=E5=BA=97=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOtherOrderCreateRepository.php        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php b/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php
index ee7f93d1..907b4b7a 100644
--- a/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php
@@ -462,9 +462,10 @@ class StoreOtherOrderCreateRepository extends StoreOtherOrderRepository
         $orderInfo = $this->v2CartIdByOrderInfo($user, $cartId, $takes, $useCoupon, $useIntegral, $addressId, true);
         $order_model = $orderInfo['order_model'];
         $order_extend = $orderInfo['order_extend'];
-        if (!$orderInfo['order_delivery_status']) {
-            throw new ValidateException('部分商品配送方式不一致,请单独下单');
-        }
+        // 以下判断无意义，v2CartIdByOrderInfo 已经判断过收货地址或自提地址
+//        if (!$orderInfo['order_delivery_status']) {
+//            throw new ValidateException('部分商品配送方式不一致,请单独下单');
+//        }
         if ($orderInfo['order_price'] > 1000000) {
             throw new ValidateException('支付金额超出最大限制');
         }