Merge branch 'master' into dev

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

@@ -149,22 +149,22 @@ class AlbumController extends Controller
         ];
 
         $app = Factory::miniProgram($config);
-        $res = $app->auth->session($datas['code']);
-        if (!$res || empty($res['openid'])) {
+        $resOPenid = $app->auth->session($datas['code']);
+        if (!$resOPenid || empty($resOPenid['openid'])) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '获取用户OpenId失败!', $validator->messages());
         }
 
-        $session = $res['session_key'];
+        $session = $resOPenid['session_key'];
         $decryptedData = $app->encryptor->decryptData($session, $datas['iv'], $datas['encryptData']);
         if (!isset($decryptedData['unionId'])) {
-            $check = AlbumUserModel::where([['open_id', $res['openid']],['store_id',$datas['store_id']]])->first();
+            $check = AlbumUserModel::where([['open_id', $resOPenid['openid']],['store_id',$datas['store_id']]])->first();
         } else {
             $check = AlbumUserModel::where([['wechat_union_id', $decryptedData['unionId']],['store_id',$datas['store_id']]])->first();
         }
-
+     //   dd($resOPenid);
         if (!$check) {
             $add['username'] = $datas['nickName'];
-            $add['open_id'] = $res['openid'];
+            $add['open_id'] = $resOPenid['openid'];
             $add['wechat_union_id'] = isset($decryptedData['unionId']) ? $decryptedData['unionId'] : '';
             $add['avatar'] = $datas['avatar'];
             $add['is_dealer'] = 0;
@@ -188,7 +188,7 @@ class AlbumController extends Controller
             $save['username'] = $datas['nickName'];
             $save['avatar'] = $datas['avatar'];
             $save['model'] = 1;
-            AlbumUserModel::where('open_id', $res['openid'])->update($save);
+            AlbumUserModel::where('open_id', $resOPenid['openid'])->update($save);
             if ($check->is_dealer == 1) {
                 $user_agent = AlbumAgentModel::where([['user_id',$check->id],['status',1]])->first();
                 $agent_id = $user_agent['id'];
@@ -209,7 +209,7 @@ class AlbumController extends Controller
                     $userAuth->up_agent_id = $request->input('agent_id');
                 }
                 $add_record['agent_id'] = $userAuth->up_agent_id;
-                $add_record['open_id'] = $res['openid'];
+                $add_record['open_id'] = $resOPenid['openid'];
                 $add_record['action'] = 4;
                 $add_record['store_id'] = $datas['store_id'];
                 $add_record['detail'] = null;