注销 不能注册

application/api/controller/Login.php

@@ -110,6 +110,12 @@ class Login extends Controller
         if (!$mobile) {
             return V(0, '登录失败, 请更换登录方式！' );
         }
+        //检测是否注销过
+        $config_time = get_system_config_value('cancel_no_login');
+        $is_del = db::name('user')->where(['mobile' => $mobile,'delete_time' => ['<>', 0]])->find();
+        if (time() - $is_del['delete_time'] < $config_time * 24 * 3600) {//30天内注销过
+            return V(0, '注销30天内，不可操作。');
+        }
 
         if(ctype_digit($mobile)){
             $reslut = model('Login')->phone_verification_code_log($mobile,$system,$login_device);

application/api/controller/Sms.php

@@ -30,6 +30,14 @@ class Sms extends Api
         if (!checkMobile($mobile)) {
             return V(0, '手机号不正确');
         }
+
+        //检测是否注销过
+        $config_time = get_system_config_value('cancel_no_login');
+        $is_del = db::name('user')->where(['mobile' => $mobile,'delete_time' => ['<>', 0]])->find();
+        if (time() - $is_del['delete_time'] < $config_time * 24 * 3600) {//30天内注销过
+            return V(0, '注销30天内，不可操作。');
+        }
+
         //频率控制
         $last = db::name('sms')->where(['mobile' => $mobile, 'event' => $event])->order('id', 'DESC')->find();
         if ($last && time() - $last['createtime'] < 60) {

application/api/model/Login.php

@@ -380,21 +380,21 @@ class Login extends Model
         if($type == 'wx'){
             $openid = $userinfo['openid'];
             $user_info_data = model('UserData')->where(['wx_openid' => $openid,'deletetime'=>0])->find();
-            $config_time = get_system_config_value('cancel_to_reset_reg');
+            $config_time = get_system_config_value('cancel_no_login');
             if(isset($user_info_data) && $user_info_data['deletetime'] != 0 && time() - $user_info_data['deletetime'] < 86400 * $config_time){
                 return ['code' => 0, 'msg' => '注销后需等待'.$config_time.'天才能重新注册', 'data' => null];
             }
         }elseif ($type == 'ali'){
             $ali_userid = $userinfo['open_id'];
             $user_info_data = model('UserData')->where(['ali_userid' => $ali_userid,'deletetime'=>0])->find();
-            $config_time = get_system_config_value('cancel_to_reset_reg');
+            $config_time = get_system_config_value('cancel_no_login');
             if(isset($user_info_data) && $user_info_data['deletetime'] != 0 && time() - $user_info_data['deletetime'] < 86400 * $config_time){
                 return ['code' => 0, 'msg' => '注销后需等待'.$config_time.'天才能重新注册', 'data' => null];
             }
         }elseif ($type == 'ios'){
             $apple_id = $userinfo;
             $user_info_data = model('UserData')->where(['apple_id' => $userinfo,'deletetime'=>0])->find();
-            $config_time = get_system_config_value('cancel_to_reset_reg');
+            $config_time = get_system_config_value('cancel_no_login');
             if(isset($user_info_data) && $user_info_data['deletetime'] != 0 && time() - $user_info_data['deletetime'] < 86400 * $config_time){
                 return ['code' => 0, 'msg' => '注销后需等待'.$config_time.'天才能重新注册', 'data' => null];
             }

application/api/model/Room.php

@@ -1290,10 +1290,12 @@ class Room extends Model
         }elseif ($apply_type == 3){
             $roomInfoStep = db::name('vs_room')->where(['id' => $room_id])->value('step');
             $room_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
-            if($roomInfoStep == 1 || ($roomInfoStep == 2 && ($room_pit['pit_number'] == 9 || $room_pit['pit_number'] == 10))){
+            if (!$room_pit) {
-                if (isset($room_pit)) {
+               return ['code' => 0, 'msg' => '网络错误', 'data' => null];
-                    model('api/RoomPit')->DownPit($user_id, $room_id, $room_pit['pit_number']);
             }
+
+            if($roomInfoStep == 1 || ($roomInfoStep == 2 && ($room_pit && $room_pit['pit_number'] == 9 || $room_pit['pit_number'] == 10))){
+                model('api/RoomPit')->DownPit($user_id, $room_id, $room_pit['pit_number']);
             }else{
                 return ['code' => 0, 'msg' => '互娱游戏麦不能退出', 'data' => null];
             }

application/api/model/RoomPit.php

@@ -730,7 +730,7 @@ class RoomPit extends Model
                     }
                     //聊天室推送系统消息
                     $FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
-                    $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
+                    $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
                     $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
                     $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
                     $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($value,1);
@@ -776,7 +776,7 @@ class RoomPit extends Model
                     Cache::set('auction_user_'.$room_id,$value);
                     //聊天室推送系统消息
                     $FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
-                    $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
+                    $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
                     $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
                     $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
                     $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($value,1);
@@ -854,7 +854,7 @@ class RoomPit extends Model
                 }
                 //制造上麦信息
                 $FromUserInfo = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find();
-                $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
+                $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $uid,'room_id' => $room_id])->value('is_online');
                 $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
                 $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
                 $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($uid,1);
@@ -1073,7 +1073,7 @@ class RoomPit extends Model
                 }
                 //制造上麦信息
                 $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex,market_value')->find();
-                $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
+                $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
                 $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($accept_user_id);//财富图标
                 $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($accept_user_id);//魅力图标
                 $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($accept_user_id,1);
@@ -1129,7 +1129,7 @@ class RoomPit extends Model
                         return ['code' => 0, 'msg' => '拍卖位上已有人，请先抱对方下麦', 'data' => null];
                     }else{
                         $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
-                        $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
+                        $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
                         $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
                         $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
                         $FromUserInfo['dress'] =  model('api/Decorate')->user_decorate_detail($accept_user_id,1);
@@ -1173,6 +1173,7 @@ class RoomPit extends Model
             }else{
                 if($pit_number == 888){
                     $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
+                    $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
                     $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
                     $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
                     $FromUserInfo['dress'] =  model('api/Decorate')->user_decorate_detail($accept_user_id,1);