diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php index 927ff3ad..ea955bb9 100644 --- a/application/adminapi/controller/Guild.php +++ b/application/adminapi/controller/Guild.php @@ -93,6 +93,8 @@ class Guild extends adminApi $list[$k]['intro'] = $v['intro']; //幸运币流水 $list[$k]['lucky_coin'] = model('Guild')->getTodayMoneyLuckyCoin($v['id'],$search_stime,$search_etime); + //查询会长手机号和后台登录密码 + $list[$k]['mobile'] = db::name('user')->where('id',$v['user_id'])->value('mobile'); } // 数组按today_money 排序 usort($list, function($a, $b) { @@ -534,6 +536,7 @@ class Guild extends adminApi $room_info = db::name('vs_room')->where(['id'=>$v['room_id']])->find(); $rum_lists[$k]['id']=$v['id']; $rum_lists[$k]['room_id']=$v['room_id']; + $room_ids[] =$v['room_id']; $rum_lists[$k]['room_code']= model('api/Decorate')->user_decorate_detail($v['room_id'], 7); $rum_lists[$k]['room_name']=$room_info['room_name']?? ''; $rum_lists[$k]['room_cover']=$room_info['room_cover']?? ''; @@ -575,7 +578,7 @@ class Guild extends adminApi 'page' =>$page, 'page_limit' => $page_limit, 'total_consumption' => $total_consumption, - 'total_lucky_coin' => db::name('vs_room_luck_value')->where($where_lucky)->sum('luck_value'), + 'total_lucky_coin' => db::name('vs_room_luck_value')->whereIn('room_id',$room_ids)->where($where_lucky)->sum('luck_value'), 'count' => $count, 'lists' => $rum_lists ]; diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php index 07820ba9..84014f5c 100644 --- a/application/api/model/UserData.php +++ b/application/api/model/UserData.php @@ -577,9 +577,18 @@ class UserData extends Model //绑定 public function bind_xinxi($user_id,$type,$alipay_account,$bank_card_number,$bank_user_name,$bank_card,$open_bank) { + //查询是否实名认证 + $is_real = model('UserData')->real_name_info($user_id); + if($is_real['code']==0){ + return ['code' => 0, 'msg' => '请先实名认证','data' => null]; + }else{ + if($is_real['data']['is_real'] !=1){ + return ['code' => 0, 'msg' => '请先实名认证','data' => null]; + } + } if($type == 2){ $data = [ -// 'alipay_name' => $alipay_name,// 姓名 + 'alipay_name' => $is_real['data']['real_name'],// 姓名 'alipay_account' => $alipay_account,// 支付宝账号 ]; $reslut = db::name('user_data')->where('user_id',$user_id)->update($data); @@ -592,9 +601,9 @@ class UserData extends Model if(!$bank_card_number){ return ['code' => 0, 'msg' => '银行卡号不能为空','data' =>null]; } - if(!$bank_user_name){ - return ['code' => 0, 'msg' => '开户人姓名不能为空','data' =>null]; - } +// if(!$bank_user_name){ +// return ['code' => 0, 'msg' => '开户人姓名不能为空','data' =>null]; +// } if(!$bank_card){ return ['code' => 0, 'msg' => '所属银行不能为空','data' =>null]; } @@ -603,7 +612,7 @@ class UserData extends Model } $data = [ 'bank_card_number' => $bank_card_number, - 'bank_user_name' => $bank_user_name, + 'bank_user_name' => $bank_user_name ? $bank_user_name : $is_real['data']['real_name'], 'bank_card' => $bank_card, 'open_bank' => $open_bank, ]; diff --git a/application/api/model/UserWithdrawal.php b/application/api/model/UserWithdrawal.php index fafaeefb..1af3c454 100644 --- a/application/api/model/UserWithdrawal.php +++ b/application/api/model/UserWithdrawal.php @@ -52,7 +52,7 @@ class UserWithdrawal extends Model } //新人多少天不允许提现 $new_user_withdraw_days = get_system_config_value('new_user_withdraw_days'); - $user_create_days = (time() - $user_info['createtime']) / 86400; + $user_create_days = floor((time() - $user_info['createtime']) / 86400); if($user_create_days < $new_user_withdraw_days){ return ['code' => 0, 'msg' => '新人'.$new_user_withdraw_days.'天内不允许提现', 'data' => null]; } @@ -88,9 +88,9 @@ class UserWithdrawal extends Model return ['code' => 0, 'msg' => '请先绑定银行卡', 'data' => null]; } //银行卡姓名 和 真实姓名 - if(trim($user_info['bank_user_name']) != trim($user_info['real_name'])){ - return ['code' => 0, 'msg' => '实名认证姓名和银行卡姓名不一致!', 'data' => null]; - } +// if(trim($user_info['bank_user_name']) != trim($user_info['real_name'])){ +// return ['code' => 0, 'msg' => '实名认证姓名和银行卡姓名不一致!', 'data' => null]; +// } } if ($number > $user_info['earnings']) { return ['code' => 0, 'msg' => '余额不足', 'data' => null];