From 58a03e755ed831c7bcf709a80d34964a80c392c6 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Thu, 29 Feb 2024 21:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=BF=E4=B8=8B=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderCreateRepository.php | 6 +++---
 .../repositories/store/order/StoreOrderRepository.php       | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index dbd54bb0..1e89c597 100755
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -827,7 +827,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         if (($orderType == 98 || $orderType == 99) && count($merchantCartList) > 1) {
             throw new ValidateException('采购、委托商品不支持跨店购买');
         }
-        if ($hasTake) {
+        if ($hasTake && $orderInfo['source'] != 999) {
             app()->make(UserAddressValidate::class)->scene('take')->check($post);
         }
 
@@ -902,8 +902,8 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 'spread_uid' => $spreadUid,
                 'top_uid' => $topUid,
                 'is_selfbuy' => $isSelfBuy,
-                'real_name' => $merchantCart['order']['isTake'] ? $post['real_name'] : ($address['real_name'] ?? ''),
-                'user_phone' => $merchantCart['order']['isTake'] ? $post['phone'] : ($address['phone'] ?? ''),
+                'real_name' => $merchantCart['order']['isTake'] ? $post['real_name'] ?? '' : ($address['real_name'] ?? ''),
+                'user_phone' => $merchantCart['order']['isTake'] ? $post['phone'] ?? '' : ($address['phone'] ?? ''),
                 'user_address' => $user_address,
                 'user_address_code' => $user_address_code,
                 'cart_id' => implode(',', array_column($merchantCart['list'], 'cart_id')),
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 7bdb4c01..72cff72a 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -231,6 +231,9 @@ class StoreOrderRepository extends BaseRepository
                 (new StoreActivityDao())->saveOrderProduct(2, $order);
                 $order->paid = 1;
                 $order->pay_time = $time;
+                if ($order->source == 999) {
+                    $order->status = 3;
+                }
                 $svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2);
                 if (isset($subOrders[$order->order_sn])) {
                     $order->transaction_id = $subOrders[$order->order_sn]['transaction_id'];