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; } // 优惠券数据,当前订单可用个优惠券