diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index e50f33a..3962758 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -14,6 +14,7 @@ use App\Service\v3\Interfaces\OrderOnlineServiceInterface; use App\Service\v3\Interfaces\UserBindTelServiceInterface; use App\Service\v3\Interfaces\AppointmentTimeServiceInterface; use Psr\Http\Message\ResponseInterface; +use App\Model\v3\UserAddress; class OrderOnlineController extends BaseController { @@ -63,16 +64,7 @@ class OrderOnlineController extends BaseController // throw new ErrorCodeException(ErrorCode::NOT_BIND_TEL_ERROR); // } //获取用户收货地址 - $res['address'] = [ - 'address' => '南宁市良庆区五象海尔·青啤联合广场', - 'area' => 'A栋八单元' , - 'lat' => '22.759950637817383', - 'lng' => '108.3835678100586', - 'sex' => '1', - 'tel' => '15677717734', - 'user_name' => '李小龙', - 'user_id' => '214' - ]; + $res['address'] = UserAddress::query()->find(15); //返回预约送达时间 数组 $res['appointment_time'] = $this->appointmentTimeService->do(); // @@ -80,7 +72,7 @@ class OrderOnlineController extends BaseController //获取用户优惠券 $res['coupon'] = $this->couponService->getUserAvailableCoupons('',$params['user_id'],'',2,'',''); //获取配送费 - $res['distribution'] = '5.0'; + $res['distribution_price'] = '5.0'; //增值服务接口 $res['value_added_service'] = [ 'select' => 1,