From c6b1a82ad6098eb9b6a44e742b071ff57ec5b2f2 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Fri, 25 Jun 2021 23:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=9D=E5=AD=98=E9=92=A9?=
 =?UTF-8?q?=E5=AD=90=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/UserAddressService.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/application/service/UserAddressService.php b/application/service/UserAddressService.php
index dd1a2d613..64940ed2f 100644
--- a/application/service/UserAddressService.php
+++ b/application/service/UserAddressService.php
@@ -395,26 +395,21 @@ class UserAddressService
 
         // 添加/更新数据
         $status = false;
-        $msg = '操作失败';
         if(empty($temp))
         {
             $data['user_id'] = $params['user']['id'];
             $data['add_time'] = time();
-            if(Db::name('UserAddress')->insertGetId($data) > 0)
+            $data_id = Db::name('UserAddress')->insertGetId($data);
+            if($data_id > 0)
             {
                 $status = true;
-                $msg = '新增成功';
-            } else {
-                $msg = '新增失败';
             }
         } else {
             $data['upd_time'] = time();
             if(Db::name('UserAddress')->where($where)->update($data))
             {
+                $data_id = $temp['id'];
                 $status = true;
-                $msg = '更新成功';
-            } else {
-                $msg = '更新失败';
             }
         }
 
@@ -434,9 +429,10 @@ class UserAddressService
             'params'        => $params,
             'data'          => $data,
             'user_id'       => $params['user']['id'],
+            'data_id'       => $data_id,
         ]);
 
-        return DataReturn($msg, $status ? 0 : -100);
+        return DataReturn('操作'.($status ? '成功' : '失败'), $status ? 0 : -100);
     }
 
     /**