|
@@ -121,22 +121,16 @@ class User extends Api
|
|
|
//如果已经有账号则直接登录
|
|
|
$ret = $this->auth->direct($user->id);
|
|
|
|
|
|
- //非首次注册男性用户每次打开app,系统自动推送女性(公会)打招呼消息3人次
|
|
|
- /*if($user->gender == 1 && $user->gh_id == 0){
|
|
|
- $this->firstopen_send($user->id);
|
|
|
- }*/
|
|
|
+
|
|
|
} else {
|
|
|
-// $this->success('选择性别', ['code' => 5]);
|
|
|
+
|
|
|
|
|
|
$extend = [
|
|
|
'register_from' => input('register_from',''),
|
|
|
'gender' => -1
|
|
|
];
|
|
|
$ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, $extend);
|
|
|
- //亿米
|
|
|
- /*if(input('register_from','') == 'xiaomi'){
|
|
|
- $this->yimi_advert();
|
|
|
- }*/
|
|
|
+
|
|
|
}
|
|
|
if ($ret) {
|
|
|
Sms::flush($mobile, 'mobilelogin');
|
|
@@ -211,20 +205,14 @@ class User extends Api
|
|
|
//如果已经有账号则直接登录
|
|
|
$ret = $this->auth->direct($user->id);
|
|
|
|
|
|
- //非首次注册男性用户每次打开app,系统自动推送女性(公会)打招呼消息3人次
|
|
|
- /*if($user->gender == 1 && $user->gh_id == 0){
|
|
|
- $this->firstopen_send($user->id);
|
|
|
- }*/
|
|
|
+
|
|
|
} else {
|
|
|
$extend = [
|
|
|
'register_from' => input('register_from',''),
|
|
|
'gender' => $gender
|
|
|
];
|
|
|
$ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, $extend);
|
|
|
- //亿米
|
|
|
- /*if(input('register_from','') == 'xiaomi'){
|
|
|
- $this->yimi_advert();
|
|
|
- }*/
|
|
|
+
|
|
|
}
|
|
|
if ($ret) {
|
|
|
Sms::flush($mobile, 'mobilelogin');
|
|
@@ -292,7 +280,7 @@ class User extends Api
|
|
|
|
|
|
|
|
|
} else {
|
|
|
-// $this->success('选择性别', ['code' => 5]);
|
|
|
+
|
|
|
|
|
|
$extend = [
|
|
|
'register_from' => input('register_from',''),
|
|
@@ -1260,22 +1248,7 @@ class User extends Api
|
|
|
$data['character_id'] = $character_id;
|
|
|
}
|
|
|
if ($introcode && !$this->auth->intro_uid) {
|
|
|
- /*if ($this->auth->intro_uid) {
|
|
|
- $this->error('您已经填写过邀请人啦');
|
|
|
- }
|
|
|
- $intro_user = Db::name('user')->field('id, intro_uid')->where('introcode', $introcode)->find();
|
|
|
- if(!$intro_user){
|
|
|
- $this->error('不存在的邀请人');
|
|
|
- }
|
|
|
- if ($intro_user['id'] == $this->auth->id) {
|
|
|
- $this->error('不能填写自己邀请码');
|
|
|
- }
|
|
|
- if ($intro_user['intro_uid'] == $this->auth->id) {
|
|
|
- $this->error('不能填写下级邀请码');
|
|
|
- }
|
|
|
|
|
|
- $data['intro_uid'] = $intro_user['id'];
|
|
|
- $data['invite_time'] = time();*/
|
|
|
|
|
|
$intro_user = Db::name('user')->field('id, intro_uid')->where('introcode', $introcode)->find();
|
|
|
if ($intro_user && $intro_user['id'] != $this->auth->id && $intro_user['intro_uid'] != $this->auth->id) {
|
|
@@ -1284,9 +1257,7 @@ class User extends Api
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// if (!$data) {
|
|
|
-// $this->error('请输入要修改的信息');
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
//开启事务
|
|
|
Db::startTrans();
|