From 5ac195ccfbbfa85f92565168b23c8a999456abb5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 3 Jul 2024 15:13:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80API=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=B0=E5=9D=80=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?=
 =?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             | 11 +++++++++--
 app/store/controller/user/AddressController.php |  7 ++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index a7b8b59f2..e7861c3e5 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -63,11 +63,11 @@ class AddressLogic extends BaseLogic
             if($is_default==1){
                 UserAddress::where('uid',$params['uid'])->update(['is_default'=>0]);
             }
+            $find=UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->find();
             $data = [
                 'real_name' => $params['real_name'],
                 'phone' => $params['phone'],
                 'detail' => $params['detail']??'',
-                'is_default' => $params['is_default']??0,
                 'detail' => $params['detail']??'',
                 'is_default' => $params['is_default']??0,
                 'province' => $params['province'],
@@ -77,7 +77,14 @@ class AddressLogic extends BaseLogic
                 'village' => $params['village'],
                 'brigade' => $params['brigade'],
             ];
-            UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data);
+            if($find){
+                UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data);
+            }else{
+                $data['is_default']=1;
+                $data['uid']=$params['uid'];
+                UserAddress::create($data);
+            }
+
             Db::commit();
             return true;
         } catch (\Exception $e) {
diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php
index 5563dc142..e53884d8c 100644
--- a/app/store/controller/user/AddressController.php
+++ b/app/store/controller/user/AddressController.php
@@ -22,10 +22,11 @@ class AddressController extends BaseAdminController
     public function edit()
     {
         $params = (new UserAddressValidate())->post()->goCheck('edit');
-        if(AddressLogic::edit($params)){
-            return $this->success('编辑成功');
-        }else{
+        AddressLogic::edit($params);
+        if(AddressLogic::hasError()){
             return $this->fail(AddressLogic::getError());
+        }else{
+            return $this->success('编辑成功');
         }
     }
     /**