From 97a7a830c34b19da47eeefa675b3e33f0969cd6b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jun 2024 11:13:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9D=80API?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/AddressLogic.php           | 12 +++--
 app/api/validate/UserAddressValidate.php      |  2 +-
 .../controller/user/AddressController.php     | 49 +++++++++++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 app/store/controller/user/AddressController.php

diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index 068aa6f0d..097204ab5 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -67,8 +67,14 @@ class AddressLogic extends BaseLogic
                 'phone' => $params['phone'],
                 'detail' => $params['detail'],
                 'is_default' => $params['is_default'],
+                'province' => $params['province'],
+                'city' => $params['city'],
+                'area' => $params['area'],
+                'street' => $params['street'],
+                'village' => $params['village'],
+                'brigade' => $params['brigade'],
             ];
-            UserAddress::where('uid', $params['uid'])->where('id', $params['address_id'])->update($data);
+            UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -93,7 +99,7 @@ class AddressLogic extends BaseLogic
 
 
     /**
-     * @notes 获取购物车表详情
+     * @notes 获取地址详情
      * @param $params
      * @return array
      * @author likeadmin
@@ -101,6 +107,6 @@ class AddressLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return UserAddress::field('id address_id,real_name,phone,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray();
+        return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where($params)->findOrEmpty()->toArray();
     }
 }
diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php
index 30a1360b6..2b0300e0f 100644
--- a/app/api/validate/UserAddressValidate.php
+++ b/app/api/validate/UserAddressValidate.php
@@ -63,7 +63,7 @@ class UserAddressValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['real_name','phone','detail','address_id']);
+        return $this->only(['real_name','phone','detail','id']);
     }
 
 
diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php
new file mode 100644
index 000000000..7406b81cc
--- /dev/null
+++ b/app/store/controller/user/AddressController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\api\controller\user;
+
+use app\api\controller\BaseApiController;
+use app\api\lists\user\UserAddressList;
+use app\api\logic\user\AddressLogic;
+use app\api\validate\UserAddressValidate;
+
+
+class AddressController extends BaseApiController
+{
+    public function lists(){
+        return $this->dataLists(new UserAddressList());
+    }
+    /**
+     * @notes 编辑地址
+     * @return \support\Response
+     * @author likeadmin
+     * @date 2024/4/24 10:37
+     */
+    public function edit()
+    {
+        $params = (new UserAddressValidate())->post()->goCheck('edit');
+        if(AddressLogic::edit($params)){
+            return $this->success('编辑成功');
+        }else{
+            return $this->fail(AddressLogic::getError());
+        }
+    }
+    /**
+     * @notes 获取地址详情
+     * @return \support\Response
+     * @author likeadmin
+     * @date 2024/4/24 10:37
+     */
+    public function detail()
+    {
+        $id = $this->request->get('id');
+        $uid = $this->request->get('uid');
+        if($id){
+            $params = ['id' => $id];
+        }
+        if($uid){
+            $params = ['uid' => $uid];
+        }
+        return $this->success('获取成功',AddressLogic::detail($params));
+    }
+}