diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 86b1c3d24..93f093766 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -791,7 +791,7 @@ class FinanceController extends ThinkController if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "pay_time >= {$timestart}"; + $map['_string'] = "payed_time >= {$timestart}"; } if (!empty(I('timeend'))) { @@ -799,7 +799,7 @@ class FinanceController extends ThinkController if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " pay_time < {$timeend}"; + $map['_string'] .= " payed_time < {$timeend}"; } if (!empty(I("promote_id"))) { @@ -839,9 +839,9 @@ class FinanceController extends ThinkController $map['game_player_name'] = array('like',I("user_nickname").'%'); } // var_dump($map);die(); - $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version"; + $field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version"; $group = ""; - $order = "pay_time DESC"; + $order = "payed_time DESC"; if(isset($_REQUEST['export'])){ $data = D('spend')->getSpendData($map,$field,$group,$order,0,0); @@ -934,12 +934,12 @@ class FinanceController extends ThinkController if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "pay_time > {$timestart}"; + $map['_string'] = "payed_time > {$timestart}"; } if (!empty(I('timeend'))) { $timeend = strtotime(I('timeend') . ' 23:59:59');; - $map['_string'] .= " and pay_time < {$timeend}"; + $map['_string'] .= " and payed_time < {$timeend}"; } if (!empty(I("promote_id"))) { @@ -979,11 +979,11 @@ class FinanceController extends ThinkController $map['tab_spend.game_player_name'] = array('like',I("user_nickname").'%'); } // var_dump($map);die(); - $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account, + $field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,tab_spend.user_account, tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version, game_player_name,pay_amount,cost,pay_way"; $group = ""; - $order = "pay_time DESC"; + $order = "payed_time DESC"; $join = false; if ($map['pay_way'] ==-1) {//绑定币 $field2 = $field . ',bind_balance'; @@ -1092,7 +1092,7 @@ class FinanceController extends ThinkController //获取现金充值 $cashStatistics = M('spend', 'tab_') ->field('pay_way,"" as pay_type,SUM(pay_amount) AS pay_amount') - ->where(['pay_status' => 1,'pay_way'=>['egt',1],'pay_time'=>$time]) + ->where(['pay_status' => 1,'pay_way'=>['egt',1],'payed_time'=>$time]) ->group('pay_way') ->select(); foreach ($cashStatistics as $key => $value) { @@ -1106,7 +1106,7 @@ class FinanceController extends ThinkController 'pay_source' => 2, 'tab_deposit.pay_status' => 1, 'tab_deposit.pay_way' => ['gt', 0], - 'tab_deposit.create_time'=>$time, + 'tab_deposit.payed_time'=>$time, ])->field('tab_deposit.pay_way,"" as pay_type, SUM(tab_deposit.pay_amount) AS balance') ->group('tab_deposit.pay_way') ->select(); @@ -1199,7 +1199,7 @@ class FinanceController extends ThinkController 'pay_status'=>1, 'pay_way'=>['egt',1], 'pay_source'=>0, - 'create_time'=>$time + 'payed_time'=>$time ]) ->group('pay_way') ->select(); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 3283e31ac..40fceb495 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -936,11 +936,11 @@ class FinancePromoteController extends AdminController $map["tab_spend.game_id"] = array("in",implode(',', array_column(getGameidByPartnerNameType($_REQUEST['partner_id'],$_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) ); } if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { - $map['pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]]; + $map['payed_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]]; } elseif (isset($_REQUEST['time_start'])) { - $map['pay_time'] = ['GT', strtotime($_REQUEST['time_start'])]; + $map['payed_time'] = ['GT', strtotime($_REQUEST['time_start'])]; } elseif (isset($_REQUEST['time_end'])) { - $map['pay_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399]; + $map['payed_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399]; } if ($_REQUEST['promote_id'] != '') { if ($_REQUEST['promote_id'] == 0 || $_REQUEST['promote_type'] == 2) { @@ -969,11 +969,11 @@ class FinancePromoteController extends AdminController if (!empty(I('user_nickname'))) { $map['tab_spend.game_player_name'] = array('like',I("user_nickname").'%'); } - $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account, + $field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,tab_spend.user_account, tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version, game_player_name,pay_amount,cost,pay_way"; $group = ""; - $order = "pay_time DESC"; + $order = "payed_time DESC"; $join = false; if ($map['pay_way'] ==-1) {//绑定币 $field2 = $field . ',bind_balance'; diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 4b7477f9b..fe8f818b1 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -557,20 +557,20 @@ class PayChannelController extends ThinkController $model = 'spend'; if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $coinMap['tab_deposit.create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $offcialmap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); - $coinMap['tab_deposit.create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $coinMap['tab_deposit.create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $coinMap['tab_deposit.payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $spreadMap['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $offcialmap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } if (!empty($_REQUEST['pay_order_number'])) { @@ -653,10 +653,14 @@ class PayChannelController extends ThinkController // unset($map['promote_id']); //超级签数据 + $superSignMap = $map; + $superSignMap['pay_time'] = $superSignMap['payed_time']; + unset($superSignMap['payed_time']); + $superSignData = M('game_supersign','tab_') ->field("order_id as pay_order_number,pay_time,tab_user.account as user_account,tab_user.promote_account,pay_price as cost,pay_price as pay_amount,pay_way") ->join('inner join tab_user on tab_user.id=tab_game_supersign.user_id') - ->where($map) + ->where($superSignMap) ->select(false); if ($model == 'spend') { @@ -753,20 +757,20 @@ class PayChannelController extends ThinkController $model = 'spend'; if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $coinMap['tab_pay_info.create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $offcialmap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); - $coinMap['tab_pay_info.create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); - $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $offcialmap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $coinMap['tab_pay_info.create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $coinMap['tab_deposit.payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $spreadMap['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $offcialmap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } if (!empty($_REQUEST['pay_order_number'])) { @@ -846,6 +850,11 @@ class PayChannelController extends ThinkController // unset($map['promote_id']); //超级签数据 + + $superSignMap = $map; + $superSignMap['pay_time'] = $superSignMap['payed_time']; + unset($superSignMap['payed_time']); + $superSignData = M('game_supersign','tab_') ->field("order_id as pay_order_number,pay_time,tab_user.account as user_account,tab_user.promote_account,pay_price as cost,pay_price as pay_amount,pay_way") ->join('inner join tab_user on tab_user.id=tab_game_supersign.user_id') @@ -979,11 +988,11 @@ class PayChannelController extends ThinkController $map = []; if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); } if (!empty($_REQUEST['pay_order_number'])) { @@ -1045,10 +1054,10 @@ class PayChannelController extends ThinkController unset($coinMap['pay_status']); unset($coinMap['pay_way']); - if ($map['pay_time']) { - $coinMap['tab_deposit.create_time'] = $map['pay_time']; - unset($coinMap['pay_time']); - } +// if ($map['pay_time']) { +// $coinMap['tab_deposit.create_time'] = $map['pay_time']; +// unset($coinMap['pay_time']); +// } // unset($coinMap['promote_id']); // setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); @@ -1145,6 +1154,12 @@ class PayChannelController extends ThinkController $map['game_id'] = $_REQUEST['game_id']; } + if ($map['payed_time']) { + $map['pay_time'] = $map['payed_time']; + unset($map['payed_time']); + } + + $map['tab_game_supersign.pay_status'] = $map['pay_status']; unset($map['pay_status']); @@ -1192,10 +1207,10 @@ class PayChannelController extends ThinkController $field = "sum(pay_price) as cost,sum(pay_price) as pay_amount,pay_way"; } elseif($model == 'deposit') { $map['pay_source'] = 0; - if ($map['pay_time']) { - $map['create_time'] = $map['pay_time']; - unset($map['pay_time']); - } +// if ($map['payed_time']) { +// $map['create_time'] = $map['pay_time']; +// unset($map['pay_time']); +// } // setPowerPromoteIds($map,'tab_deposit.promote_id'); $data = M('deposit','tab_') ->field("pay_order_number,order_number,user_account,create_time as pay_time,pay_amount as cost,pay_amount,pay_way as pay_type,pay_way") diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 1de768647..de9ec0347 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -70,6 +70,81 @@ class PublicController extends \Think\Controller } } + /** + * 后台用户登录 + * @author 麦当苗儿 + */ + public function phone_login($mobile = null, $verify = null) + { + if (IS_POST) { + if (!$this->checksafecode($mobile, $verify)) { + $this->error('验证码错误'); + } + $member = M('ucenter_member ucenter') + ->field("uid,nickname,last_login_time,status") + ->join("left join sys_member member on ucenter.id=member.uid") + ->where(['mobile' => $mobile])->find(); + + if(!$member || 1 != $member['status']) { + $error = '用户不存在或已被禁用！'; //应用级别禁用 + $this->error($error); + return false; + } + + if ($member) { + /* 记录登录SESSION和COOKIES */ + $Member = D('Member'); + $Member->autoLogin($member); + + } +// else { +// $partner = M('partner', 'tab_')->where(['link_phone' => $mobile,])->find(); +// if ($partner) { +// /* 记录登录SESSION和COOKIES */ +// $cp_auth = array( +// 'link_man'=>$partner['link_man'], +// 'mobile_phone' => $partner['link_phone'], +// 'company_name' => $partner['partner'], +// 'company_type'=>"cp", +// 'company_id' => $partner['id'], +// ); +// $session_name = 'cp_user_auth'; +// if (I('auto_login')) { +// $expireTime = 60*60*24*30;//自动登录一个月 +// ini_set('session.gc_maxlifetime', $expireTime); +// ini_set('session.cookie_lifetime', $expireTime); +// session($session_name, $cp_auth); +// session($session_name.'_sign', data_auth_sign($cp_auth)); +// session($session_name.'_expire', time()); +// } else { +// session($session_name, $cp_auth); +// session($session_name.'_sign', data_auth_sign($cp_auth)); +// } +// +// $uid = $partner['id']; +// } +// } + /* 登录用户 */ + $this->success('登录成功！', U('Index/index')); + + } else { + if (is_login()) { + $this->redirect('Index/index'); + } else { + /* 读取数据库中的配置 */ + $config = S('DB_CONFIG_DATA'); + if (!$config) { + $config = D('Config')->lists(); + S('DB_CONFIG_DATA', $config); + } + + C($config); //添加配置 + + $this->display(); + } + } + } + /** * 后台用户登录 * @author 麦当苗儿 diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index f015a4e4d..3370b1e4f 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -442,9 +442,9 @@ class PromoteModel extends Model{ if(!$show_data_power){ - $parseData[$key]['account'] = encryptStr($parseData[$key]['account']); +// $parseData[$key]['account'] = encryptStr($parseData[$key]['account']); $parseData[$key]['mobile_phone'] = encryptStr($parseData[$key]['mobile_phone']); - $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']); +// $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']); } diff --git a/Application/Admin/View/Public/login.html b/Application/Admin/View/Public/login.html index c9d7d35b0..7cfbfbe3d 100644 --- a/Application/Admin/View/Public/login.html +++ b/Application/Admin/View/Public/login.html @@ -46,7 +46,7 @@
-

用户登录User Login

+

用户登录User Login     短信登录

  • diff --git a/Application/Admin/View/Public/phone_login.html b/Application/Admin/View/Public/phone_login.html new file mode 100644 index 000000000..d18c1712c --- /dev/null +++ b/Application/Admin/View/Public/phone_login.html @@ -0,0 +1,206 @@ + + + + + + + {:C('WEB_SITE_TITLE')} + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + + + + +
    + + + +
    + +
    +

    手机号码快捷登录User Login短信登录

    +
      +
    • + + +
      • +
    • + + +
      获取验证码
      +
      • +
      • +
    • 下次自动登录
      • +
    +
    + + +
    + +
    + + + +
    这是内容
    + + + + + + + +