From c2d403039c8518a4596a067894adf26f4b47e756 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sun, 21 Jan 2024 17:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderCreateRepository.php      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 4c16530e..6224bf41 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -73,6 +73,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         //虚拟订单自定义数据
         $order_extend = [];
         //检查商品类型, 活动商品只能单独购买
+        $allowDelivery = true;
         foreach ($merchantCartList as $merchantCart) {
 
             if (($merchantCart['type_id'] != Merchant::TypeSupplyChain) && $address) {
@@ -108,7 +109,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 if ($cart['product']['extend']) {
                     $order_extend = json_decode($cart['product']['extend'], true);
                 }
-                $allowDelivery = true;
                 if ($address) {
                     if ($cart['source'] == 0 || $cart['source'] == 103) {
                          $userAddressCode = ($address['province_code'] ?? '') . ',' . ($address['city_code'] ?? '') . ',' . ($address['district_code'] ?? '') . ',' . ($address['street_code'] ?? '') . ',' . ($address['village_code'] ?? '') . ',' . ($address['brigade_id'] ?? 0);
@@ -196,11 +196,11 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                     $merTake = $merTake && $proTake;
                     $proDelivery = (!count($delivery_way) || in_array('2', $delivery_way, true));
                     $merDelivery = $merDelivery && $proDelivery;
-                    $merchantCart['list'][$k]['allow_take'] = $proTake;
-                    $merchantCart['list'][$k]['allow_delivery'] = $proDelivery;
+                    $merchantCart['list'][$k]['allow_take'] = true;
+                    $merchantCart['list'][$k]['allow_delivery'] = $allowDelivery;
                 } else {
-                    $merchantCart['list'][$k]['allow_take'] = $_merTake;
-                    $merchantCart['list'][$k]['allow_delivery'] = $_merDelivery;
+                    $merchantCart['list'][$k]['allow_take'] = true;
+                    $merchantCart['list'][$k]['allow_delivery'] = $allowDelivery;
                 }
                 if ($createOrder && $isTake && !$merTake) {
                     $deliveryStatus = false;
@@ -669,8 +669,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             'key',
             'platformConsumption',
             'consumption_money',
-            'consumption_id',
-            'allowDelivery'
+            'consumption_id'
         ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
     }