完善安卓微信授权绑定逻辑

app/common/repositories/user/UserExtractRepository.php

@@ -1056,24 +1056,57 @@ class UserExtractRepository extends BaseRepository
         }
         return ["msg"=>'绑定成功'];
     }
-    public function band_openid($openid,$uid){
-        $user_data["wechat_user_id"]=$openid;
-        $user_count=Db::name('user')->where($user_data)->count();
-        if($user_count>0){
-            return true;
-        }
-        $data["openid"]=$openid;
-        $count=Db::name("user_extract_openid")->where($data)->count();
-        if($count>0){
+
+    public function band_openid($openid, $uid, $nickname = '', $avatar = '')
+    {
+        // 屎山上边堆屎
+        $existUid = Db::name('user_extract_openid')->where('openid', $openid)->value('uid');
+        if (!empty($existUid) && $existUid != $uid) {
             return false;
         }
-        $data["uid"]=$uid;
-
-        $wx_type=input("wx_type/d",0);
-        $data["type"]=$wx_type==1?1:0;
-        Db::name("user_extract_openid")->insert($data);
+        $check = Db::name('user_extract_openid')->where('uid', $uid)->value('openid');
+        if (!empty($check)) {
+            if ($check != $openid) {
+                return false;
+            }
+        } else {
+            Db::name("user_extract_openid")->insert([
+                'uid' => $uid,
+                'openid' => $openid,
+                'type' => 1
+            ]);
+        }
+        /** @var UserRepository  $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userRepository->updateUser(
+            $uid,
+            ['wechat_user_id' => $openid],
+            [
+                "type" => 1,
+                "uid" => $uid,
+                "nickname" => $nickname,
+                "avater" => $avatar,
+            ]
+        );
         return true;
-//        return ["msg"=>'绑定成功'];
+
+        // $user_data["wechat_user_id"] = $openid;
+        // $user_count = Db::name('user')->where($user_data)->count();
+        // if ($user_count < 0) {
+        //
+        // }
+        // $data["openid"] = $openid;
+        // $count = Db::name("user_extract_openid")->where($data)->count();
+        // if ($count > 0) {
+        //     return false;
+        // }
+        // $data["uid"] = $uid;
+        //
+        // $wx_type = input("wx_type/d", 0);
+        // $data["type"] = $wx_type == 1 ? 1 : 0;
+        // Db::name("user_extract_openid")->insert($data);
+        // return true;
+        // //        return ["msg"=>'绑定成功'];
     }
 
     /*获取绑卡账户*/

app/controller/api/user/UserExtract.php

@@ -171,11 +171,13 @@ class UserExtract extends BaseController
     public function band_openid(){
         $type=input("type/d","1");
         $openid=input("openid","");
+        $nickname = input("nickname", "");
+        $avatar = input("openid", "");
         if(empty($openid)){
             return app('json')->fail("绑定微信失败");
         }
         $uid = $this->request->uid();
-        $res=$this->repository->band_openid($openid,$uid);
+        $res=$this->repository->band_openid($openid,$uid, $nickname, $avatar);
         if($res){
             return app('json')->success('绑定成功');
         }