|
@@ -1148,29 +1148,21 @@ class User extends Api
|
|
|
$userData = model('User')->where($where)->find();//老用户
|
|
|
if (!empty($userData)) {
|
|
|
if (empty($userData['openid'])) {
|
|
|
- model('User')->update(['openid'=>$userData['openid']],$where);
|
|
|
+ model('User')->update(['openid'=>$user['openid']],$where);//老用户更新openid
|
|
|
} else {
|
|
|
$this->error('该手机号已被其他用户绑定');
|
|
|
}
|
|
|
}
|
|
|
- $verification = $user->verification;
|
|
|
- $verification->mobile = 1;
|
|
|
- $user->verification = $verification;
|
|
|
- if (empty($user->username)) {
|
|
|
- $user->username = $mobile;
|
|
|
- }
|
|
|
- $userRes = $user->save();
|
|
|
-
|
|
|
- if ($userRes) {
|
|
|
- $whereDel['mobile'] = '';
|
|
|
- $whereDel['status'] = 'new';
|
|
|
- $userDel = model('User')->where($whereDel)->find();
|
|
|
- $userPowerWhere['user_id'] = $userDel['id'];
|
|
|
- model('UserPower')->where($userPowerWhere)->delete();
|
|
|
- model('User')->where($whereDel)->delete();
|
|
|
- }
|
|
|
+ //清除微信登录没绑定手机号的数据
|
|
|
+ $whereDel['mobile'] = '';
|
|
|
+ $whereDel['status'] = 'new';
|
|
|
+ $userDel = model('User')->where($whereDel)->find();
|
|
|
+ $userPowerWhere['user_id'] = $userDel['id'];
|
|
|
+ model('UserPower')->where($userPowerWhere)->delete();
|
|
|
+ model('User')->where($whereDel)->delete();
|
|
|
|
|
|
Sms::flush($mobile, 'changemobile');
|
|
|
+ $this->auth->direct($userData['id']);
|
|
|
$this->success('success',$this->userInfo('return'));
|
|
|
} catch (Exception $e) {
|
|
|
$this->error($e->getMessage());
|