APP/小程序-调整微信授权登录逻辑

app/common/repositories/user/UserRepository.php

@@ -3237,59 +3237,121 @@ class UserRepository extends BaseRepository
 
     }
 
-    /*微信登录验证
-     $openid 微信openid
-    */
-    public  function  wechatCheck($openid, $nickname = null, $headimgurl = null){
-        $user = Db::name("user")->where(['wechat_user_id'=>$openid])->find();
-        //判断是否是第一次登录
-        if($user){
-            //成功登录业务逻辑
-            if (!$user['account']) {
+    /**
+     * 微信登录验证
+     * @param $openid
+     * @param $nickname
+     * @param $headimgurl
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function wechatCheck($openid, $nickname = null, $headimgurl = null): array
+    {
+        // 1、判断 该openID 是否绑定多个用户
+        $userDataList = Db::name("user")->where(['wechat_user_id' => $openid])->select()->toArray();
+        $normalUserDataList = [];
+        $normalUserData = [];
+        if (!empty($userDataList)) {
+            $resetWechatUserIdList = [];
+            foreach ($userDataList as $userdata) {
+                if ($userdata['is_del'] == 1) {
+                    $resetWechatUserIdList[] = $userdata['uid'];
+                } else {
+                    $normalUserDataList[] = $userdata;
+                }
+            }
+            if (!empty($resetWechatUserIdList)) {
+                Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
+            }
+            if (count($normalUserDataList) > 1) {
+                return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
+            } else if (count($normalUserDataList) < 1) {
                 return ['code' => 400, 'msg' => '请绑定手机号'];
             } else {
-                $existUid = Db::name('user_extract_openid')->where('openid', $openid)->value('uid');
-                if (!empty($existUid) && $existUid != $user['uid']) {
-                    $existUserData = Db::name("user")->where("uid", $existUid)->find();
-                    if ($existUserData['is_del'] != 1) {
-                        return ['code' => 400, 'msg' => '此微信号已被绑定'];
+                $normalUserData = array_shift($normalUserDataList);
+            }
+        } else {
+            return ['code' => 400, 'msg' => '请绑定手机号'];
+        }
+
+        // 2、更新 user_extract_openid
+        $existOpenIdDataList = Db::name('user_extract_openid')->where('openid', $openid)->select()->toArray();
+        $normalUserDataListByExtractOpenid = [];
+        $normalUserDataByExtractOpenid = [];
+        if (!empty($existOpenIdDataList)) {
+            $existUidList = array_column($existOpenIdDataList, 'uid');
+            // 查询 用户
+            $existUserData = Db::name("user")->whereIn("uid", $existUidList)->select()->toArray();
+            if (!empty($existUserData)) {
+                $resetWechatUserIdList = [];
+                $deleteUserExtractOpenidByUidList = [];
+                foreach ($existUserData as $userdata) {
+                    if ($userdata['is_del'] == 1) {
+                        $resetWechatUserIdList[] = $userdata['uid'];
                     } else {
-                        Db::name('user_extract_openid')->where('openid',$openid)->delete();
-                        Db::name("user")->where(['uid' => $existUid])->update(["wechat_user_id" => 0]);
+                        // if ($userdata['wechat_user_id'] == $openid) {
+                        $normalUserDataListByExtractOpenid[] = $userdata;
+                        // } else {
+                        //     $deleteUserExtractOpenidByUidList[] = $userdata['uid'];
+                        // }
                     }
                 }
-                $check = Db::name('user_extract_openid')->where('uid', $user['uid'])->value('openid');
-                if (!empty($check)) {
-                    if ($check != $openid) {
-                        return ['code' => 400, 'msg' => '当前用户已绑定其他微信号'];
-                    }
-                } else {
-                    Db::name("user_extract_openid")->insert([
-                        'uid' => $user['uid'],
-                        'openid' => $openid,
-                        'type' => 1
-                    ]);
+                // 已删除的用户
+                if (!empty($resetWechatUserIdList)) {
+                    Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                    Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                    Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
                 }
-                $data2 = [];
-                if (!is_null($nickname) || !is_null($headimgurl)) {
-                    $data2 = [
-                        "type" => 1,
-                        "uid" => $user['uid'],
-                        "nickname" => $nickname ?: '',
-                        "avater" => $headimgurl ?: '',
-                    ];
+                // // 用户表绑定的 微信ID 和 微信授权表中的不一致
+                // if (!empty($deleteUserExtractOpenidByUidList)) {
+                //     Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->where('openid', $openid)->delete();
+                // }
+                if (count($normalUserDataListByExtractOpenid) > 1) {
+                    return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
+                } else {
+                    $normalUserDataByExtractOpenid = array_shift($normalUserDataListByExtractOpenid);
                 }
-                $this->updateUser(
-                    $user['uid'],
-                    ['wechat_user_id' => $openid],
-                    $data2
-                );
+            } else {
+                Db::name('user_extract_openid')->where('openid', $openid)->delete();
+            }
+        }
 
-                return ['code' => 200, 'msg' => '登陆成功', 'user' => $user];
+        if (empty($normalUserDataByExtractOpenid)) {
+            if (!empty($normalUserData)) {
+                Db::name("user_extract_openid")->insert([
+                    'uid' => $normalUserData['uid'],
+                    'openid' => $openid,
+                    'type' => 1
+                ]);
+            } else {
+                return ['code' => 400, 'msg' => '请绑定手机号'];
+            }
+        } else {
+            if ($normalUserDataByExtractOpenid['uid'] != $normalUserData['uid']) {
+                return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
             }
-        }else{
-            return ['code' => 400, 'msg' => '请绑定手机号'];
         }
+
+        $data2 = [];
+        if (!is_null($nickname) || !is_null($headimgurl)) {
+            $data2 = [
+                "type" => 1,
+                "uid" => $normalUserData['uid'],
+                "nickname" => $nickname ?: '',
+                "avater" => $headimgurl ?: '',
+            ];
+        }
+        $this->updateUser(
+            $normalUserData['uid'],
+            ['wechat_user_id' => $openid],
+            $data2
+        );
+
+        return ['code' => 200, 'msg' => '登录成功', 'user' => $normalUserData];
     }
 
     /**

app/controller/api/Auth.php

@@ -1684,33 +1684,31 @@ class Auth extends BaseController
     }
 
 
-    /*微信授权登录*/
-    public function wechatCheck(){
-        $data =  $this->request->params(['openid']);
-        // , 'nickname', 'avatar'
+    /**
+     * 微信授权登录 一键登录
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function wechatCheck()
+    {
+        $data = $this->request->params(['openid']);
         $data['nickname'] = $this->request->param('nickname', null);
         $data['avatar'] = $this->request->param('avatar', null);
 
-        if(!$data['openid'] || $data['openid'] == '' || $data['openid'] =='undefined'){
+        if (!$data['openid'] || $data['openid'] == '' || $data['openid'] == 'undefined') {
             return app('json')->fail("openid参数缺失");
         }
 
+        /** @var UserRepository $repository */
         $repository = app()->make(UserRepository::class);
-        if($this->source=='yhc'){
-            $result =  $repository ->wechatCheckYhc($data['openid']);
-        }else{
-            $result =  $repository ->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
-        }
-        if(isset($result['code']) && $result['code'] == 200){
+        $result = $repository->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
+
+        if (isset($result['code']) && $result['code'] == 200) {
             $user = $repository->accountByUser($result['user']['account']);
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
-            if($this->source=='yhc'){
-//                $user=$user->toArray();
-                $user->avatar=Db::name('enterprise_user')->where('mer_id',$this->merId)->where('uid',$user['uid'])->value('avatar');
-            }
-
-
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }
         return app("json")->fail($result['msg']);

app/controller/api/user/User.php

@@ -2670,16 +2670,33 @@ class User extends BaseController
             if ($type == 1) {
                 $data = ["wechat_user_id" => $openid];
                 $unionId = $openid;
-                $existUid = Db::name('user_extract_openid')->where('openid',$unionId)->value('uid');
-                if (!empty($existUid) && $existUid != $uid) {
-                    $existUserData = Db::name("user")->where("uid", $existUid)->find();
-                    if ($existUserData['is_del'] != 1) {
-                        throw new \Exception("此微信号已被绑定");
-                    } else {
-                        Db::name('user_extract_openid')->where('openid',$unionId)->delete();
-                        Db::name("user")->where(['uid' => $existUid])->update(["wechat_user_id" => 0]);
+                $userDataList = Db::name("user")->where(['wechat_user_id' => $unionId])->select()->toArray();
+                $normalUserDataList = [];
+                $normalUserData = [];
+                if (!empty($userDataList)) {
+                    $resetWechatUserIdList = [];
+                    foreach ($userDataList as $userdata) {
+                        if ($userdata['is_del'] == 1) {
+                            $resetWechatUserIdList[] = $userdata['uid'];
+                        } else {
+                            $normalUserDataList[] = $userdata;
+                        }
+                    }
+                    if (!empty($resetWechatUserIdList)) {
+                        Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                        Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                        Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
+                    }
+                    if (count($normalUserDataList) > 1) {
+                        throw new \Exception("当前微信号异常，请联系客服！");
+                    } else if (count($normalUserDataList) == 1) {
+                        $normalUserData = array_shift($normalUserDataList);
+                        if ($normalUserData['uid'] != $uid) {
+                            throw new \Exception("此微信号已被绑定");
+                        }
                     }
                 }
+
                 $check = Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
                 if (!empty($check)){
                     if ($check != $unionId) throw new \Exception("当前用户已绑定其他微信号");