From 73e0961d5a952c8601a2719af11102fd9b60a89e Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 29 Jun 2019 00:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/UserService.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/service/UserService.php b/application/service/UserService.php
index ff33c05c8..c7ea4aef8 100755
--- a/application/service/UserService.php
+++ b/application/service/UserService.php
@@ -1780,6 +1780,21 @@ class UserService
             return DataReturn('用户openid不能为空', -20);
         }
 
+        // 获取用户信息
+        $temp_user = Db::name('User')->where('mobile', '=', $data['mobile'])->find();
+        $open_user = Db::name('User')->where($accounts_field, '=', $params[$accounts_field])->find();
+
+        // 如果手机号码存在，并且openid也已存在，则更新掉之前的openid
+        if(!empty($temp_user))
+        {
+            if(!empty($open_user))
+            {
+                Db::name('User')->where(['id'=>$open_user['id']])->update([$accounts_field=>'', 'upd_time'=>time()]);
+            }
+        } else {
+            $temp_user = $open_user;
+        }
+
         // 是否需要审核
         $common_register_is_enable_audit = MyC('common_register_is_enable_audit', 0);
 
@@ -1790,14 +1805,6 @@ class UserService
             'status'            => ($common_register_is_enable_audit == 1) ? 3 : 0,
         );
 
-        // 获取用户信息
-        $where = ['is_delete_time' => 0];
-        $accounts_where = [
-            ['mobile', '=', $data['mobile']],
-            [$accounts_field, '=', $params[$accounts_field]],
-        ];
-        $temp_user = Db::name('User')->where($where)->whereOr($accounts_where)->find();
-
         // 额外信息
         if(empty($temp_user['nickname']) && !empty($params['nickname']))
         {