Wesmiler

app/Http/Controllers/Api/v1/MemberController.php

@@ -77,6 +77,27 @@ class MemberController extends webApp
             return showJson(1046, false, $error);
         }
     }
+
+    /**
+     * 修改资料
+     * @return array
+     */
+    public function modify()
+    {
+        try {
+            $params = request()->all();
+            if (!$result = MemberService::make()->modify($this->userId, $params)) {
+                return showJson(MemberService::make()->getError(), false);
+            } else {
+                return showJson(MemberService::make()->getError(), true, $result);
+            }
+        } catch (\Exception $exception){
+            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
+            return showJson(1046, false, $error);
+        }
+    }
+
+
     /**
      * 获取手机号
      * @return array

app/Services/Api/MemberService.php

@@ -534,7 +534,7 @@ class MemberService extends BaseService
     }
 
     /**
-     * 修改账号信息
+     * 修改信息
      * @param $userId
      * @param $params
      * @return bool
@@ -550,18 +550,16 @@ class MemberService extends BaseService
         // 用户验证
         RedisService::set($cacheLockKey, ['user_id' => $userId, 'params' => $params], rand(2, 3));
         $info = $this->model->where(['id' => $userId, 'mark' => 1])
-            ->select(['id', 'password', 'status'])
+            ->select(['id', 'nickname','avatar', 'status'])
             ->first();
-        $userPassword = isset($info['password']) ? $info['password'] : '';
         if (!$info || $info['status'] != 1) {
-            $this->error = 1029;
+            $this->error = 2016;
             RedisService::clear($cacheLockKey);
             return false;
         }
 
-        // 密码校验
-        $data = ['update_time' => time()];
         // 修改数据
+        $data = ['update_time' => time()];
         $nickname = isset($params['nickname']) ? $params['nickname'] : '';
         if (isset($params['nickname']) && $nickname) {
             $data['nickname'] = $nickname;
@@ -572,28 +570,6 @@ class MemberService extends BaseService
             $data['mobile'] = $mobile;
         }
 
-        $address = isset($params['address']) ? $params['address'] : '';
-        if (isset($params['address']) && $address) {
-            $data['address'] = $address;
-        }
-
-        $password = isset($params['password']) ? $params['password'] : '';
-        $newPassword = isset($params['new_password']) ? $params['new_password'] : '';
-        if (isset($params['password']) && $password) {
-            if ($userPassword != get_password($password)) {
-                $this->error = 1038;
-                RedisService::clear($cacheLockKey);
-                return false;
-            }
-
-            if (empty($newPassword)) {
-                $this->error = 1039;
-                RedisService::clear($cacheLockKey);
-                return false;
-            }
-            $data['password'] = get_password($newPassword);
-        }
-
         // 头像
         $avatar = isset($params['avatar']) ? $params['avatar'] : '';
         if (isset($params['avatar']) && $avatar) {