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

app/controller/api/user/User.php

@@ -1291,6 +1291,10 @@ class User extends BaseController
         // 需求描述说：更换用户手机号时，同步更新 商户申请表、商户表、商户管理员表
         $data['phone'] = $this->request->param('phone', null);
         $sms_code = $this->request->param('sms_code', null);
+        $data = array_filter($data, function ($value) {
+            return !is_null($value);
+        });
+
         if (!empty($data['phone'])) {
             $changeUserData = $this->repository->getOne(['phone' => $data['phone']]);
             if (!empty($changeUserData)) {
@@ -2597,20 +2601,29 @@ class User extends BaseController
         $type = $this->request->param('type');
         $uid = $this->request->uid();
         makeLock()->lock();
+        Db::startTrans();
         try {
+            $user_data = Db::name("user")->where(['uid' => $uid])->find();
             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 对象删除
+                }
+                Db::name("user")->where(['uid' => $uid])->update(["wechat_user_id" => 0]);
+                Db::name('user_account')->where('uid', $uid)->where('type', 1)->delete();
             } else {
-                $data = ["ali_user_id" => 0];
+                Db::name("user")->where(['uid' => $uid])->update(["ali_user_id" => 0]);
+                Db::name('user_account')->where('uid', $uid)->where('type', 2)->delete();
             }
-            $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);
+        return app("json")->success("解绑成功", []);
     }
 
     /**
@@ -2635,8 +2648,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("参数异常");