From a06072408b4bb8b78d7251ed36577e84d098ea70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Wed, 8 Dec 2021 14:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=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 --- ...ller.php => ShippingAddressController.php} | 26 +++++++++---------- ...source.php => ShippingAddressResource.php} | 4 +-- app/Endpoint/Api/routes.php | 4 +-- .../{Address.php => ShippingAddress.php} | 2 +- app/Models/User.php | 6 ++--- ...31430_create_shipping_addresses_table.php} | 6 ++--- resources/lang/zh_CN/models.php | 4 +-- 7 files changed, 26 insertions(+), 26 deletions(-) rename app/Endpoint/Api/Http/Controllers/{AddressController.php => ShippingAddressController.php} (72%) rename app/Endpoint/Api/Http/Resources/{AddressResource.php => ShippingAddressResource.php} (87%) rename app/Models/{Address.php => ShippingAddress.php} (93%) rename database/migrations/{2021_12_07_131430_create_addresses_table.php => 2021_12_07_131430_create_shipping_addresses_table.php} (83%) diff --git a/app/Endpoint/Api/Http/Controllers/AddressController.php b/app/Endpoint/Api/Http/Controllers/ShippingAddressController.php similarity index 72% rename from app/Endpoint/Api/Http/Controllers/AddressController.php rename to app/Endpoint/Api/Http/Controllers/ShippingAddressController.php index d5a2e9ee..2a92bbd4 100644 --- a/app/Endpoint/Api/Http/Controllers/AddressController.php +++ b/app/Endpoint/Api/Http/Controllers/ShippingAddressController.php @@ -2,12 +2,12 @@ namespace App\Endpoint\Api\Http\Controllers; -use App\Endpoint\Api\Http\Resources\AddressResource; +use App\Endpoint\Api\Http\Resources\ShippingAddressResource; use App\Models\Zone; use App\Rules\PhoneNumber; use Illuminate\Http\Request; -class AddressController extends Controller +class ShippingAddressController extends Controller { /** * 地址列表 @@ -17,9 +17,9 @@ class AddressController extends Controller */ public function index(Request $request) { - $addresses = $request->user()->addresses()->latest('id')->get(); + $addresses = $request->user()->shippingAddresses()->latest('id')->get(); - return AddressResource::collection($addresses->sortByDesc('is_default')); + return ShippingAddressResource::collection($addresses->sortByDesc('is_default')); } /** @@ -42,15 +42,15 @@ class AddressController extends Controller $user = $request->user(); - $address = $user->addresses()->create( + $address = $user->shippingAddresses()->create( array_merge($input, ['zone' => $zone->full_name]) ); if ($address->is_default) { - $user->addresses()->where('id', '!=', $address->id)->update(['is_default' => false]); + $user->shippingAddresses()->where('id', '!=', $address->id)->update(['is_default' => false]); } - return AddressResource::make($address); + return ShippingAddressResource::make($address); } /** @@ -61,9 +61,9 @@ class AddressController extends Controller */ public function show($id, Request $request) { - $address = $request->user()->addresses()->findOrFail($id); + $address = $request->user()->shippingAddresses()->findOrFail($id); - return AddressResource::make($address); + return ShippingAddressResource::make($address); } /** @@ -85,7 +85,7 @@ class AddressController extends Controller $user = $request->user(); - $address = $user->addresses()->findOrFail($id); + $address = $user->shippingAddresses()->findOrFail($id); $address->fill($input); if ($address->isDirty('zone_id')) { @@ -97,10 +97,10 @@ class AddressController extends Controller $address->save(); if ($address->is_default && $address->wasChanged('is_default')) { - $user->addresses()->where('id', '!=', $address->id)->update(['is_default' => false]); + $user->shippingAddresses()->where('id', '!=', $address->id)->update(['is_default' => false]); } - return AddressResource::make($address); + return ShippingAddressResource::make($address); } /** @@ -112,7 +112,7 @@ class AddressController extends Controller */ public function destroy($id, Request $request) { - $request->user()->addresses()->where('id', $id)->delete(); + $request->user()->shippingAddresses()->where('id', $id)->delete(); return response()->noContent(); } diff --git a/app/Endpoint/Api/Http/Resources/AddressResource.php b/app/Endpoint/Api/Http/Resources/ShippingAddressResource.php similarity index 87% rename from app/Endpoint/Api/Http/Resources/AddressResource.php rename to app/Endpoint/Api/Http/Resources/ShippingAddressResource.php index c8e553e8..14a6f3c9 100644 --- a/app/Endpoint/Api/Http/Resources/AddressResource.php +++ b/app/Endpoint/Api/Http/Resources/ShippingAddressResource.php @@ -4,7 +4,7 @@ namespace App\Endpoint\Api\Http\Resources; use Illuminate\Http\Resources\Json\JsonResource; -class AddressResource extends JsonResource +class ShippingAddressResource extends JsonResource { /** * Transform the resource into an array. @@ -17,7 +17,7 @@ class AddressResource extends JsonResource return [ 'id' => $this->id, 'zone_id' => $this->zone_id, - 'consignee' => $this->consignee, + 'name' => $this->name, 'telephone' => $this->telephone, 'zone' => $this->zone, 'address' => $this->address, diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php index 57b57b2c..0742d67d 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; @@ -14,6 +13,7 @@ use App\Endpoint\Api\Http\Controllers\Product\ProductCategoryController; use App\Endpoint\Api\Http\Controllers\Product\ProductSkuController; use App\Endpoint\Api\Http\Controllers\Product\ProductSkuFavoriteController; use App\Endpoint\Api\Http\Controllers\Product\ProductViewLogController; +use App\Endpoint\Api\Http\Controllers\ShippingAddressController; use App\Endpoint\Api\Http\Controllers\ShoppingCartItemController; use App\Endpoint\Api\Http\Controllers\SmsCodeController; use Illuminate\Support\Facades\Route; @@ -67,6 +67,6 @@ Route::group([ Route::delete('shopping-cart-items', [ShoppingCartItemController::class, 'delete']); Route::put('shopping-cart-items/{shopping_cart_item}', [ShoppingCartItemController::class, 'update']); - Route::apiResource('addresses', AddressController::class); + Route::apiResource('shipping-addresses', ShippingAddressController::class); }); }); diff --git a/app/Models/Address.php b/app/Models/ShippingAddress.php similarity index 93% rename from app/Models/Address.php rename to app/Models/ShippingAddress.php index dc029fd5..4f8223d0 100644 --- a/app/Models/Address.php +++ b/app/Models/ShippingAddress.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; -class Address extends Model +class ShippingAddress extends Model { /** * @var array diff --git a/app/Models/User.php b/app/Models/User.php index 4b3e7a17..c15d84ad 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -87,11 +87,11 @@ class User extends Model implements AuthorizableContract, AuthenticatableContrac } /** - * 属于此用户的地址 + * 属于此用户的收货地址 */ - public function addresses() + public function shippingAddresses() { - return $this->hasMany(Address::class); + return $this->hasMany(ShippingAddress::class); } /** diff --git a/database/migrations/2021_12_07_131430_create_addresses_table.php b/database/migrations/2021_12_07_131430_create_shipping_addresses_table.php similarity index 83% rename from database/migrations/2021_12_07_131430_create_addresses_table.php rename to database/migrations/2021_12_07_131430_create_shipping_addresses_table.php index 6df8c214..c338b6d2 100644 --- a/database/migrations/2021_12_07_131430_create_addresses_table.php +++ b/database/migrations/2021_12_07_131430_create_shipping_addresses_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateAddressesTable extends Migration +class CreateShippingAddressesTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateAddressesTable extends Migration */ public function up() { - Schema::create('addresses', function (Blueprint $table) { + Schema::create('shipping_addresses', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('user_id')->comment('用户ID'); $table->unsignedBigInteger('zone_id')->comment('地区ID'); @@ -33,6 +33,6 @@ class CreateAddressesTable extends Migration */ public function down() { - Schema::dropIfExists('addresses'); + Schema::dropIfExists('shipping_addresses'); } } diff --git a/resources/lang/zh_CN/models.php b/resources/lang/zh_CN/models.php index acb910e2..def87f5a 100644 --- a/resources/lang/zh_CN/models.php +++ b/resources/lang/zh_CN/models.php @@ -1,13 +1,13 @@ '地址', + ShippingAddress::class => '地址', ProductSpu::class => '商品', ProductSku::class => '商品', ShoppingCartItem::class => '商品',