diff --git a/app/agent/controller/Index.php b/app/agent/controller/Index.php index 45327ac..71fbf20 100644 --- a/app/agent/controller/Index.php +++ b/app/agent/controller/Index.php @@ -165,16 +165,25 @@ class Index $has_user = $user_model->isExit("LoginCode='".$data['LoginCode']."' or Phone='".$data['Phone']."' or TaoBao='".$data['Phone']."'"); if ($has_user){ - $info = [ - 'Code' => 20000, - 'Data' => '', - 'Message' => '该账号或者手机号被注册了', - ]; - echo json_encode($info); - die; + if ($has_user['is_verify'] == 0) { + $data_user_old = [ + 'LoginCode' => $has_user['LoginCode'].'-del', + 'Phone' => $has_user['Phone'].'-del', + ]; + + $user_model->updateOne(['Id'=>$has_user['Id']],$data_user_old); + } + // $info = [ + // 'Code' => 20000, + // 'Data' => '', + // 'Message' => '该账号或者手机号被注册了', + // ]; + // echo json_encode($info); + // die; } - $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1'"); + $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1"); + if ($has_user2){ $info = [ 'Code' => 30000, diff --git a/app/taobao/controller/Index.php b/app/taobao/controller/Index.php index 99b2cee..9ce62fc 100644 --- a/app/taobao/controller/Index.php +++ b/app/taobao/controller/Index.php @@ -107,16 +107,25 @@ class Index $has_user = $user_model->isExit("LoginCode='".$data['LoginCode']."' or Phone='".$data['Phone']."' or TaoBao='".$data['Phone']."'"); if ($has_user){ - $info = [ - 'Code' => 20000, - 'Data' => '', - 'Message' => '该账号或者手机号被注册了', - ]; - echo json_encode($info); - die; + if ($has_user['is_verify'] == 0) { + $data_user_old = [ + 'LoginCode' => $has_user['LoginCode'].'-del', + 'Phone' => $has_user['Phone'].'-del', + ]; + + $user_model->updateOne(['Id'=>$has_user['Id']],$data_user_old); + } + // $info = [ + // 'Code' => 20000, + // 'Data' => '', + // 'Message' => '该账号或者手机号被注册了', + // ]; + // echo json_encode($info); + // die; } - $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1'"); + $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1"); + if ($has_user2){ $info = [ 'Code' => 30000, diff --git a/app/taobao/controller/Realname.php b/app/taobao/controller/Realname.php index 408bd04..5b59128 100644 --- a/app/taobao/controller/Realname.php +++ b/app/taobao/controller/Realname.php @@ -110,16 +110,25 @@ class Realname $has_user = $user_model->isExit("LoginCode='".$data['LoginCode']."' or Phone='".$data['Phone']."' or TaoBao='".$data['Phone']."'"); if ($has_user){ - $info = [ - 'Code' => 20000, - 'Data' => '', - 'Message' => '该账号或者手机号被注册了', - ]; - echo json_encode($info); - die; + if ($has_user['is_verify'] == 0) { + $data_user_old = [ + 'LoginCode' => $has_user['LoginCode'].'-del', + 'Phone' => $has_user['Phone'].'-del', + ]; + + $user_model->updateOne(['Id'=>$has_user['Id']],$data_user_old); + } + // $info = [ + // 'Code' => 20000, + // 'Data' => '', + // 'Message' => '该账号或者手机号被注册了', + // ]; + // echo json_encode($info); + // die; } - $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1'"); + $has_user2 = $user_model->isExit("id_code='".$data['id_code']."' and is_verify=1"); + if ($has_user2){ $info = [ 'Code' => 30000,