调整第三方解绑方法

app/controller/api/user/User.php

@@ -2601,18 +2601,26 @@ class User extends BaseController
         $type = $this->request->param('type');
         $uid = $this->request->uid();
         makeLock()->lock();
+        Db::startTrans();
         try {
             if ($type == 1) {
                 $data = ["wechat_user_id" => 0];
+                $user_extract_openid = Db::name('user_extract_openid')->where('uid',$uid)->find();
+                if (!empty($user_extract_openid)) {
+                    Db::name('log')->insert(['data' => '三方授权解绑（' . $uid . ')' . json_encode($user_extract_openid)]);
+                    Db::name('user_extract_openid')->where('uid', $uid)->delete();  // 使用 Db 对象删除
+                }
             } else {
                 $data = ["ali_user_id" => 0];
             }
             $result = $this->repository->updateUser($uid, $data);
             if (!$result) throw new \Exception("修改失败");
         } catch (\Throwable $e) {
+            Db::rollback();
             makeLock()->unlock();
             return app("json")->fail("失败" . $e->getMessage());
         }
+        Db::commit();
         makeLock()->unlock();
         return app("json")->success("解绑成功", $data);
     }
@@ -2639,8 +2647,14 @@ class User extends BaseController
             if ($type == 1) {
                 $data = ["wechat_user_id" => $openid];
                 $unionId = $openid;
+                $check = Db::name('user_extract_openid')->where('openid',$openid)->value('uid');
+                if (!empty($check) && $check != $uid){
+                    throw new \Exception("此微信号已被其他用户绑定");
+                }
                 $check = Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
-                if ($check) throw new \Exception("此微信号已被绑定");
+                if (!empty($check) && $check != $openid){
+                    throw new \Exception("您已绑定其他微信号");
+                }
             } else {
                 $alinfo = json_decode($alinfo, true);
                 if (!$alinfo) throw new \Exception("参数异常");