From f06f71033eac6ffc9eddd917d22ccab0ba149a27 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Tue, 5 Jul 2022 10:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Models/Address.php                                  | 2 +-
 beike/Shop/Http/Controllers/Account/AddressController.php | 4 ++--
 beike/Shop/Services/AddressService.php                    | 7 +++++--
 database/migrations/2022_06_28_065137_create_address.php  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/beike/Models/Address.php b/beike/Models/Address.php
index 0be680d2..fef6e122 100644
--- a/beike/Models/Address.php
+++ b/beike/Models/Address.php
@@ -19,7 +19,7 @@ class Address extends Model
 {
     use HasFactory;
 
-    protected $fillable = ['customer_id', 'name', 'phone', 'country_id', 'state_id', 'state', 'city_id', 'city', 'zipcode', 'address_1', 'address_2'];
+    protected $fillable = ['customer_id', 'name', 'phone', 'country_id', 'zone_id', 'zone', 'city_id', 'city', 'zipcode', 'address_1', 'address_2'];
 
     public function country(): BelongsTo
     {
diff --git a/beike/Shop/Http/Controllers/Account/AddressController.php b/beike/Shop/Http/Controllers/Account/AddressController.php
index 64372a4a..d74fc928 100644
--- a/beike/Shop/Http/Controllers/Account/AddressController.php
+++ b/beike/Shop/Http/Controllers/Account/AddressController.php
@@ -39,14 +39,14 @@ class AddressController extends Controller
 
     public function store(AddressRequest $request)
     {
-        $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'zone', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']);
+        $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']);
         $address = AddressService::create($data);
         return json_success('创建成功', new AddressResource($address));
     }
 
     public function update(AddressRequest $request, int $id)
     {
-        $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'zone', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']);
+        $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']);
         $address = AddressService::update($id, $data);
         return json_success('更新成功', new AddressResource($address));
     }
diff --git a/beike/Shop/Services/AddressService.php b/beike/Shop/Services/AddressService.php
index 87ea82e3..5efa44fc 100644
--- a/beike/Shop/Services/AddressService.php
+++ b/beike/Shop/Services/AddressService.php
@@ -14,12 +14,14 @@ namespace Beike\Shop\Services;
 
 
 use Beike\Repositories\AddressRepo;
+use Beike\Repositories\ZoneRepo;
 
 class AddressService
 {
     public static function create($data)
     {
-        $data['customer_id'] = current_customer()->customer_id;
+        $data['customer_id'] = current_customer()->id;
+        $data['zone'] = ZoneRepo::find($data['zone_id'])->name;
         $address = AddressRepo::create($data);
         return $address;
     }
@@ -27,7 +29,8 @@ class AddressService
     public static function update($id, $data)
     {
         $address = AddressRepo::find($id);
-        if ($address->customer_id != current_customer()->customer_id) {
+        $data['zone'] = ZoneRepo::find($data['zone_id'])->name;
+        if ($address->customer_id != current_customer()->id) {
             $address;
         }
         return AddressRepo::update($address, $data);
diff --git a/database/migrations/2022_06_28_065137_create_address.php b/database/migrations/2022_06_28_065137_create_address.php
index 2d0f54a0..6823aed3 100644
--- a/database/migrations/2022_06_28_065137_create_address.php
+++ b/database/migrations/2022_06_28_065137_create_address.php
@@ -21,7 +21,7 @@ class CreateAddress extends Migration
             $table->unsignedInteger('country_id');
             $table->unsignedInteger('zone_id');
             $table->string('zone');
-            $table->unsignedInteger('city_id');
+            $table->unsignedInteger('city_id')->nullable();
             $table->string('city');
             $table->string('zipcode');
             $table->string('address_1');