From 780eb1f930ada656944b1347d815d8c6cf911bd6 Mon Sep 17 00:00:00 2001 From: weigang Date: Wed, 30 Sep 2020 14:43:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AE=B0=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/Implementations/OrderOnlineService.php | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index 3da0063..76812e0 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -21,6 +21,8 @@ use App\Model\v3\OrderMain; use App\Model\v3\OrderSalesStatistic; use App\Model\v3\ShoppingCart; use App\Model\v3\Store; +use App\Model\v3\User; +use App\Model\v3\UserAddress; use App\Service\v3\Interfaces\BadgeServiceInterface; use App\Service\v3\Interfaces\CouponRecServiceInterface; use App\Service\v3\Interfaces\CouponServiceInterface; @@ -157,12 +159,21 @@ class OrderOnlineService implements OrderOnlineServiceInterface $deliveryDistance = $userAddrAndDPrice['delivery_distance']; $shippingType = Shipping::TYPE_LANZU; } else { - $market = Market::query()->find($marketId); - $userAddr->tel = $market->tel; - $userAddr->address = $market->address ; - $userAddr->user_name = $market->name; - $userAddr->lat = $market->lat; - $userAddr->lng = $market->lng; + + $user = User::query()->find($userId); + $userDefaultAddr = UserAddress::query()->where(['user_id' => $userId])->orderBy('is_default', 'desc')->first(); + $userAddr->tel = $user->tel; + $userAddr->address = $userDefaultAddr->address ?? ''; + $userAddr->user_name = $userDefaultAddr->user_name ?? $user->nick_name; + $userAddr->lat = $userDefaultAddr->lat ?? ''; + $userAddr->lng = $userDefaultAddr->lng ?? ''; + + // $market = Market::query()->find($marketId); + // $userAddr->tel = $market->tel; + // $userAddr->address = $market->address ; + // $userAddr->user_name = $market->name; + // $userAddr->lat = $market->lat; + // $userAddr->lng = $market->lng; } // 优惠券数据，当前订单可用个优惠券