From 5ac052b4d12d0ec28c73611ef9015e0e3906b7fe Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Sat, 5 Sep 2020 20:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntroller.php => UserAddressController.php} | 42 +++++++++++------ .../v3/Implementations/UserAddressService.php | 46 +++++++++++++++++++ .../UserAddressServiceInterface.php | 14 ++++++ config/autoload/dependencies.php | 1 + config/routes.php | 1 + 5 files changed, 89 insertions(+), 15 deletions(-) rename app/Controller/v3/{UserDeliveryAddressController.php => UserAddressController.php} (50%) create mode 100644 app/Service/v3/Implementations/UserAddressService.php create mode 100644 app/Service/v3/Interfaces/UserAddressServiceInterface.php diff --git a/app/Controller/v3/UserDeliveryAddressController.php b/app/Controller/v3/UserAddressController.php similarity index 50% rename from app/Controller/v3/UserDeliveryAddressController.php rename to app/Controller/v3/UserAddressController.php index 872b120..8d9a431 100644 --- a/app/Controller/v3/UserDeliveryAddressController.php +++ b/app/Controller/v3/UserAddressController.php @@ -4,32 +4,44 @@ namespace App\Controller\v3; use App\Controller\BaseController; - -class UserDeliveryAddressController extends BaseController +use App\Service\v3\Interfaces\UserAddressServiceInterface; +use Hyperf\Di\Annotation\Inject; +class UserAddressController extends BaseController { + /** + * @Inject + * @var UserAddressServiceInterface + */ + protected $userAddressService; + public function update() { - return $this->success(true); + $userAddressId = $this->request->input('user_address_id',''); + $user_id = $this->request->input('user_id',''); + $user_name = $this->request->input('user_name',''); + $address = $this->request->input('address',''); + $doorplate = $this->request->input('doorplate',''); + $gender = $this->request->input('gender',''); + $lat = $this->request->input('lat',''); + $lng = $this->request->input('lng',''); + $tel = $this->request->input('tel',''); + $tags = $this->request->input('tags',''); + $res = $this->userAddressService->do($userAddressId,$user_id,$user_name,$address,$doorplate,$gender,$lat,$lng,$tel,$tags); + return $this->success($res); } public function get() { - return $this->success( - [ - 'id' => 1, - 'name' => '李小龙', - 'sex' => '1', - 'tel' => '15677455632', - 'address' => '南宁市青秀区金湖北路59号地王国际商会中心', - 'detailed_address' => 'A栋805', - 'tag' => '同事家' - ] - ); + $userId = $this->request->input('user_id'); + $res = $this->userAddressService->getDefault($userId); + return $this->success($res); } public function delete() { - return $this->success(true); + $userAddressId = $this->request->input('user_address_id'); + $res = $this->userAddressService->undo($userAddressId); + return $this->success($res); } public function getList() diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php new file mode 100644 index 0000000..eb1b24f --- /dev/null +++ b/app/Service/v3/Implementations/UserAddressService.php @@ -0,0 +1,46 @@ +find($userAddressId); + $userAddress->user_id = $user_id; + $userAddress->user_name = $user_name; + $userAddress->address = $address; + $userAddress->doorplate = $doorplate; + $userAddress->gender = $gender; + $userAddress->lat = $lat; + $userAddress->lng = $lng; + $userAddress->tel = $tel; + $userAddress->tags = $tags; + return $userAddress->create(); + } + + public function check() + { + + } + + public function undo($userAddressId) + { + $userAddress = UserAddress::query()->find($userAddressId); + return $userAddress->delete(); + } + + public function getDefault($userId) + { + return UserAddress::query()->where('is_default',1)->find($userId); + } + + public function getList($userId) + { + return UserAddress::query()->find($userId); + } +} \ No newline at end of file diff --git a/app/Service/v3/Interfaces/UserAddressServiceInterface.php b/app/Service/v3/Interfaces/UserAddressServiceInterface.php new file mode 100644 index 0000000..fdc108f --- /dev/null +++ b/app/Service/v3/Interfaces/UserAddressServiceInterface.php @@ -0,0 +1,14 @@ + \App\Service\v3\Implementations\WithdrawalListService::class, \App\Service\v3\Interfaces\OrderOfflineServiceInterface::class => \App\Service\v3\Implementations\OrderOfflineService::class, \App\Service\v3\Interfaces\BusinessHoursServiceInterface::class => \App\Service\v3\Implementations\BusinessHoursService::class, + \App\Service\v3\Interfaces\UserAddressServiceInterface::class => \App\Service\v3\Implementations\UserAddressService::class, ]; diff --git a/config/routes.php b/config/routes.php index 0d898fc..fade882 100644 --- a/config/routes.php +++ b/config/routes.php @@ -123,4 +123,5 @@ Router::addGroup('/v3/', function () { Router::post('payment/wechatpayOnline', 'App\Controller\v3\PaymentController@wechatpayOnline'); Router::post('store/getBusinessHours', 'App\Controller\v3\StoreController@getBusinessHours'); Router::post('store/updateBusinessHours', 'App\Controller\v3\StoreController@updateBusinessHours'); + Router::post('userAddress/update', 'App\Controller\v3\UserAddressController@update'); },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]); \ No newline at end of file