用户地址暂时还是要用着

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;
             }