|
|
@ -91,9 +91,11 @@ class OrderOnlineController extends BaseController |
|
|
['user_id','=',$userId], |
|
|
['user_id','=',$userId], |
|
|
['is_default','=',1], |
|
|
['is_default','=',1], |
|
|
]) |
|
|
]) |
|
|
->select('id') |
|
|
|
|
|
->first(); |
|
|
->first(); |
|
|
$res['location'] = $this->userAddressService->getAddressAndDistributionPrice($address->id,$marketId); |
|
|
|
|
|
|
|
|
$res['location'] = [ |
|
|
|
|
|
'address' => $address, |
|
|
|
|
|
'distribution_price' => 0 |
|
|
|
|
|
]; |
|
|
//返回预约送达时间 数组
|
|
|
//返回预约送达时间 数组
|
|
|
$res['appointment_time'] = $this->appointmentTimeService->do(); |
|
|
$res['appointment_time'] = $this->appointmentTimeService->do(); |
|
|
//
|
|
|
//
|
|
|
|