update

app/Http/Controllers/Api/V1/CommonController.php

@@ -52,15 +52,20 @@ class CommonController extends Controller
         $session_key = !empty($data['session_key']) ? $data['session_key'] : '';
         $user = User::select(['id', 'status', 'phone', 'nickname', 'avatar'])->where('openid', $data['openid'])->first();
         if (empty($user)){
-            $user = User::create([
+            $add = [
                 'openid' => $data['openid'],
-                'nickname' => $req['nickname'] ?? '',
-                'avatar' => $req['avatar'] ?? '',
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
                 'phone' => $req['phone'] ?? '',
                 'session_key' => $session_key
-            ]);
+            ];
+            $add['nickname'] = $req['nickname'] ?? '';
+            $add['avatar'] = $req['avatar'] ?? request()->getScheme().'://'.request()->getHost().'/img/default-head.png';
+            $user = User::create($add);
+            if (empty($add['nickname'])) {
+                $nickname = '用户'.base_convert($user['id'], 10, 16);
+                User::where('id', $user['id'])->update(['nickname' => $nickname]);
+            }
         }
         else {
             if ($user['status'] == 0) {
@@ -76,6 +81,14 @@ class CommonController extends Controller
                 'session_key' => $session_key
             ];
             $update = array_filter($update);
+
+            if (empty($req['nickname']) && empty($user['nickname'])) {
+                $update['nickname'] = $req['nickname'] = '用户'.base_convert($user['id'], 10, 16);;
+            }
+            if (empty($req['avatar']) && empty($user['avatar'])) {
+                $update['avatar'] = $req['avatar'] = request()->getScheme().'://'.request()->getHost().'/img/default-head.png';
+            }
+
             User::where('id', $user['id'])->update($update);
         }
 
@@ -109,11 +122,14 @@ class CommonController extends Controller
             }
 
             if (!User::where('openid', $data['openid'])->exists()){
-                User::create([
+                $user = User::create([
                     'openid' => $data['openid'],
                     'phone' => $decryptedData['phoneNumber'],
-                    'session_key' => $data['session_key']
+                    'session_key' => $data['session_key'],
+                    'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
                 ]);
+                $nickname = '用户'.base_convert($user['id'], 10, 16);
+                User::where('id', $user['id'])->update(['nickname' => $nickname]);
             }
 
         } catch (\Exception $e) {