From 9560b4f2beeb334ba634e2b00accfdb6e93c2fdd Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 23 Jul 2024 15:24:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9D=80API?=
 =?UTF-8?q?=E7=9C=81=E4=BB=BD=E3=80=81=E5=9F=8E=E5=B8=82=E3=80=81=E5=8C=BA?=
 =?UTF-8?q?=E3=80=81=E8=A1=97=E9=81=93=E3=80=81=E6=9D=91=E3=80=81=E9=98=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/AddressLogic.php      |  8 +++++++-
 app/api/validate/UserAddressValidate.php | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index e7861c3e5..9b54b1692 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -35,7 +35,13 @@ class AddressLogic extends BaseLogic
                 'uid' => $params['uid'],
                 'real_name' => $params['real_name'],
                 'phone' => $params['phone'],
-                'detail' => $params['detail'],
+                'province'=> $params['province'],
+                'city' => $params['city'],
+                'area' => $params['area'],
+                'street' => $params['street'],
+                'village' => $params['village'],
+                'brigade' => $params['brigade'],
+                'detail' => '',
                 'is_default' => $params['is_default'],
             ]);
             Db::commit();
diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php
index b7911da0e..0dbf68f86 100644
--- a/app/api/validate/UserAddressValidate.php
+++ b/app/api/validate/UserAddressValidate.php
@@ -21,7 +21,11 @@ class UserAddressValidate extends BaseValidate
     protected $rule = [
         'real_name' => 'require',
         'phone' => 'require',
-        'detail' => 'require',
+        'city' => 'require',
+        'area' => 'require',
+        'street' => 'require',
+        'village' => 'require',
+        'brigade' => 'require',
         'address_id' => 'require',
         "is_default"=>"require|in:0,1"
 
@@ -38,7 +42,12 @@ class UserAddressValidate extends BaseValidate
         'phone' => '收货人电话',
         'detail' => '收货人详细地址',
         'address_id' => '地址id',
-        "is_default"=>"默认地址"
+        "is_default"=>"默认地址",
+        'city'=>'城市',
+        'area'=>'区',
+        'street'=>'街道',
+        'village'=>'村',
+        'brigade'=>'队'
 
     ];
 
@@ -51,7 +60,7 @@ class UserAddressValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['real_name','phone','detail']);
+        return $this->only(['real_name','phone','city','area','street','village','brigade']);
     }
 
 
@@ -63,7 +72,7 @@ class UserAddressValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['real_name','phone','id']);
+        return $this->only(['real_name','phone','id','city','area','street','village','brigade']);
     }