Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/Auth.php

@@ -1920,6 +1920,7 @@ class Auth extends BaseController
             $pc = new WXBizDataCrypt($appid, $sessionKey);
 //            dump($pc);
             $errCode = $pc->decryptData($encryptedData, $iv, $data );
+            // $data   "{\"phoneNumber\":\"15350612089\",\"purePhoneNumber\":\"15350612089\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1745288870,\"appid\":\"wx9082e5ac2fdb513f\"}}"
 //            dump($errCode);
             if ($errCode != 0) {
                 return app('json')->fail('没有获取到手机号1');

app/controller/api/user/User.php

@@ -2653,8 +2653,15 @@ 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) throw new \Exception("此微信号已被绑定");
                 $check = Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
-                if ($check) throw new \Exception("此微信号已被绑定");
+                if (!empty($check) && $check != $unionId) throw new \Exception("当前用户已绑定其他微信号");
+                Db::name("user_extract_openid")->insert([
+                    'uid' => $uid,
+                    'openid' => $unionId,
+                    'type' => 1
+                ]);
             } else {
                 $alinfo = json_decode($alinfo, true);
                 if (!$alinfo) throw new \Exception("参数异常");