APP/小程序-登录

app/controller/api/Auth.php

@@ -2025,36 +2025,39 @@ class Auth extends BaseController
                 $repository->registr($phone, 123456,'APP','','','',$spread_uid);
             }
             $user = $repository->accountByUser($phone);
-            if($this->source=='yhc' && $this->merId){
-                $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-                $count=Db::name('enterprise_user')->where($where)->count();
-                if($count<1){
-                    $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-                    $data = $this->request->params(['spread', 'share_id']);
-
-                    if(isset($data['spread']) && $data['spread']){
-                        $insert['puid']= $data['spread'];
-                        $insert['node_uid']= $data['spread'];
-                    }else if(isset($data['share_id']) && $data['share_id']){
-                        $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                        $insert['puid']= $spread_uid;
-                        $insert['node_uid']= $spread_uid;
-                    }
-                    if(!isset($insert['node_uid']) || !$insert['node_uid']){
-                        return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
-                    }
-
-                    if(isset($data['spread']) && isset($zhuce)){
-                        $insert['puid']= $data['spread'];
-                        $insert['node_uid']= $data['spread'];
-                    }
-                    Db::name('enterprise_user')->insert($insert);
-                }
+            // if($this->source=='yhc' && $this->merId){
+            //     $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+            //     $count=Db::name('enterprise_user')->where($where)->count();
+            //     if($count<1){
+            //         $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+            //         $data = $this->request->params(['spread', 'share_id']);
+            //
+            //         if(isset($data['spread']) && $data['spread']){
+            //             $insert['puid']= $data['spread'];
+            //             $insert['node_uid']= $data['spread'];
+            //         }else if(isset($data['share_id']) && $data['share_id']){
+            //             $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+            //             $insert['puid']= $spread_uid;
+            //             $insert['node_uid']= $spread_uid;
+            //         }
+            //         if(!isset($insert['node_uid']) || !$insert['node_uid']){
+            //             return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
+            //         }
+            //
+            //         if(isset($data['spread']) && isset($zhuce)){
+            //             $insert['puid']= $data['spread'];
+            //             $insert['node_uid']= $data['spread'];
+            //         }
+            //         Db::name('enterprise_user')->insert($insert);
+            //     }
+            // }
+            if (!empty($user) && $user instanceof User) {
+                $user = $repository->mainUser($user);
+                $tokenInfo = $repository->createToken($user);
+                return app('json')->success($repository->returnToken($user, $tokenInfo));
+            } else {
+                return app('json')->fail('未查询到用户信息');
             }
-            $user = $repository->mainUser($user);
-
-            $tokenInfo = $repository->createToken($user);
-            return app('json')->success($repository->returnToken($user, $tokenInfo));
         }catch (Exception $exception){
             Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】']);
         }