From 36939effe349f1863362f3f07af9c93e4a97fd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Wed, 9 Oct 2024 16:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=90=8D=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/agent/controller/Index.php     | 25 +++++++++++++++++--------
 app/taobao/controller/Index.php    | 25 +++++++++++++++++--------
 app/taobao/controller/Realname.php | 25 +++++++++++++++++--------
 3 files changed, 51 insertions(+), 24 deletions(-)

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,