Merge branch '20241224_lj_avator' into dev

app/JsonRpc/UserService.php

@@ -539,16 +539,34 @@ class UserService implements UserServiceInterface
      */
     public function updateUserAvatarNickname(array $data): array
     {
-        $where = [
-            'id' => $data['user_id'],
-        ];
-        unset($data['user_id']);
-        $result = User::where($where)->update($data);
-        if ($result) {
-            $result = User::where($where)->get();
+        Db::beginTransaction();
+        try {
+            $updateData = [];
+            $where1 = [
+                'id' => $data['user_id'],
+            ];
+            if (!empty($data['nickname'])) {
+                $updateData = ['nickname' => $data['nickname']];
+            }
+            if (!empty($data['avatar'])) {
+                $updateData = ['avatar' => $data['avatar']];
+            }
+            $result = User::where($where1)->update($updateData);
+            $updateData = [];
+            $where = [
+                'user_id' => $data['user_id'],
+            ];
+            if (!empty($data['real_name'])) {
+                $updateData = ['real_name' => $data['real_name']];
+            }
+            $result = UserInfo::where($where)->update($updateData);
+            $result = User::where($where1)->first();
+            Db::commit();
             return Result::success($result);
-        } else {
-            return Result::error('修改失败');
+        } catch (\Throwable $ex) {
+            Db::rollBack();
+            var_dump($ex->getMessage());
+            return Result::error("创建失败", 0);
         }
     }
 }