From f1f1a95c572d5fea0bb599f6df69e0cd31e06a3b Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Tue, 22 Sep 2020 16:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E8=BF=98=E6=98=AF=E8=A6=81=E7=94=A8=E7=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/OrderOnlineService.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php
index f5415a7..003e7b9 100644
--- a/app/Service/v3/Implementations/OrderOnlineService.php
+++ b/app/Service/v3/Implementations/OrderOnlineService.php
@@ -140,13 +140,17 @@ class OrderOnlineService implements OrderOnlineServiceInterface
             $shippingType = Shipping::TYPE_SELF_TAKE;
 
             // 如果非自提，则通过用户地址计算相关数据和费用
-            if ($selfTake != 1) {
+            // if ($selfTake != 1) {
                 // 用户收货地址
                 // 获取配送费用
                 $userAddrAndDPrice = $this->userAddressService->getAddressAndDistributionPrice($userAddrId, $marketId);
                 $userAddr = $userAddrAndDPrice['address']['address'];
                 $deliveryAmount = $userAddrAndDPrice['distribution_price'];
                 $deliveryDistance = $userAddrAndDPrice['delivery_distance'];
+                // $shippingType = Shipping::TYPE_LANZU;
+            // }
+
+            if ($selfTake != 1) {
                 $shippingType = Shipping::TYPE_LANZU;
             }