From c89644a051cf46bdc25d83ac4b9375da1953bb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Mon, 6 Dec 2021 17:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=9C=B0=E5=9D=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/AddressController.php | 117 ------------------ .../Api/Http/Resources/AddressResource.php | 28 ----- app/Endpoint/Api/routes.php | 3 - app/Models/Address.php | 36 ------ ...21_12_03_175347_create_addresses_table.php | 39 ------ 5 files changed, 223 deletions(-) delete mode 100644 app/Endpoint/Api/Http/Controllers/AddressController.php delete mode 100644 app/Endpoint/Api/Http/Resources/AddressResource.php delete mode 100644 app/Models/Address.php delete mode 100644 database/migrations/2021_12_03_175347_create_addresses_table.php diff --git a/app/Endpoint/Api/Http/Controllers/AddressController.php b/app/Endpoint/Api/Http/Controllers/AddressController.php deleted file mode 100644 index e3f7be7c..00000000 --- a/app/Endpoint/Api/Http/Controllers/AddressController.php +++ /dev/null @@ -1,117 +0,0 @@ -user()->addresses()->latest('id')->get(); - - return AddressResource::collection($addresses); - } - - /** - * 创建地址 - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\JsonResponse - */ - public function store(Request $request) - { - $input = $request->validate([ - 'consignee' => ['bail', 'required', 'string', 'max:150'], - 'telephone' => ['bail', 'required', new PhoneNumber()], - 'province' => ['bail', 'required', 'string', 'max:255'], - 'city' => ['bail', 'required', 'string', 'max:255'], - 'district' => ['bail', 'required', 'string', 'max:255'], - 'address' => ['bail', 'required', 'string', 'max:255'], - 'is_default' => ['bail', 'required', 'boolean'], - ]); - - $user = $request->user(); - - $address = $user->addresses()->create($input); - - // 如果当前地址变为默认地址，则将其它地址设为非默认地址 - if ($address->is_default) { - $user->addresses()->where('id', '!=', $address->id)->update([ - 'is_default' => false, - ]); - } - - return AddressResource::make($address); - } - - /** - * 查看地址 - * - * @param int $id - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\JsonResponse - */ - public function show($id, Request $request) - { - $address = $request->user()->addresses()->findOrFail($id); - - return AddressResource::make($address); - } - - /** - * 修改地址 - * - * @param int $id - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\JsonResponse - */ - public function update($id, Request $request) - { - $input = $request->validate([ - 'consignee' => ['bail', 'required', 'string', 'max:150'], - 'telephone' => ['bail', 'required', new PhoneNumber()], - 'province' => ['bail', 'required', 'string', 'max:255'], - 'city' => ['bail', 'required', 'string', 'max:255'], - 'district' => ['bail', 'required', 'string', 'max:255'], - 'address' => ['bail', 'required', 'string', 'max:255'], - 'is_default' => ['bail', 'required', 'boolean'], - ]); - - $user = $request->user(); - - $address = $user->addresses()->findOrFail($id); - $address->update($input); - - // 如果当前地址变更为默认地址，则将其它地址设为非默认地址 - if ($address->wasChanged('is_default') && $address->is_default) { - $user->addresses()->where('id', '!=', $address->id)->update([ - 'is_default' => false, - ]); - } - - return AddressResource::make($address); - } - - /** - * 删除地址 - * - * @param int $id - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function destroy($id, Request $request) - { - $request->user()->addresses()->where('id', $id)->delete(); - - return response()->noContent(); - } -} diff --git a/app/Endpoint/Api/Http/Resources/AddressResource.php b/app/Endpoint/Api/Http/Resources/AddressResource.php deleted file mode 100644 index 9c911be5..00000000 --- a/app/Endpoint/Api/Http/Resources/AddressResource.php +++ /dev/null @@ -1,28 +0,0 @@ - $this->id, - 'consignee' => $this->consignee, - 'telephone' => $this->telephone, - 'province' => $this->province, - 'city' => $this->city, - 'district' => $this->district, - 'address' => $this->address, - 'is_default' => $this->is_default, - ]; - } -} diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php index 8b7f1f71..e95c03ae 100644 --- a/app/Endpoint/Api/routes.php +++ b/app/Endpoint/Api/routes.php @@ -3,7 +3,6 @@ use App\Endpoint\Api\Http\Controllers\Account\ChangePasswordController; use App\Endpoint\Api\Http\Controllers\Account\UserController; use App\Endpoint\Api\Http\Controllers\AdController; -use App\Endpoint\Api\Http\Controllers\AddressController; use App\Endpoint\Api\Http\Controllers\Auth\LoginController; use App\Endpoint\Api\Http\Controllers\Auth\LogoutController; use App\Endpoint\Api\Http\Controllers\Auth\RegisterController; @@ -51,8 +50,6 @@ Route::group([ // 修改密码 Route::post('change-password', ChangePasswordController::class); - Route::apiResource('addresses', AddressController::class); - // 收藏商品 Route::post('product/products/{product}/collect', [ProductSkuController::class, 'collect']); // 取消商品收藏 diff --git a/app/Models/Address.php b/app/Models/Address.php deleted file mode 100644 index ed814e46..00000000 --- a/app/Models/Address.php +++ /dev/null @@ -1,36 +0,0 @@ - false, - ]; - - /** - * @var array - */ - protected $fillable = [ - 'user_id', - 'consignee', - 'telephone', - 'province', - 'city', - 'district', - 'address', - 'is_default', - ]; - - /** - * @var array - */ - protected $casts = [ - 'is_default' => 'bool', - ]; -} diff --git a/database/migrations/2021_12_03_175347_create_addresses_table.php b/database/migrations/2021_12_03_175347_create_addresses_table.php deleted file mode 100644 index d8bb3199..00000000 --- a/database/migrations/2021_12_03_175347_create_addresses_table.php +++ /dev/null @@ -1,39 +0,0 @@ -id(); - $table->unsignedBigInteger('user_id')->index()->comment('用户ID'); - $table->string('consignee')->comment('收件人'); - $table->string('telephone')->comment('电话'); - $table->string('province')->comment('省'); - $table->string('city')->comment('市'); - $table->string('district')->comment('区'); - $table->string('address')->comment('地址'); - $table->boolean('is_default')->default(false)->comment('是否默认'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('addresses'); - } -}