From 0b72d9607145f540122a85a5f19f4fa91c0783f1 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 24 Jan 2024 15:57:47 +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/StoreOrderCreateRepository.php             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 9918bb85..1656a336 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -710,9 +710,10 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         if ($pay_type == 'balance' && $orderInfo['source'] != 103 && $orderInfo['source'] != 105) {
             throw new ValidateException('余额支付只能用于里海云仓');
         }
-        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('支付金额超出最大限制');
         }