'; + echo ''; + exit; + } +} + diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 1c73b54b0..b6f18c89e 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -824,81 +824,6 @@ class PromoteController extends BaseController return '' === $str ? '' : md5(sha1($str) . $key); } - /** - *子账号 - */ - public function mychlid($p = 0) - { - $account = I('account', ''); - $idcard = I('idcard', ''); - $mobile = I('mobile', ''); - $realName = I('real_name', ''); - $status = I('status', 'all'); - - $promoteId = session("promote_auth.pid"); - - $model = new PromoteModel(); - $promotes = $model->field(['id', 'account'])->where('parent_id=' . $promoteId)->select(); - $subPromotes = $model->field(['id', 'account'])->where('parent_id=' . $promoteId . ' or grand_id=' . $promoteId . ' or id=' . $promoteId)->select(); - - $map = []; - if ($account) { - $map['account'] = ['like', '%' . $account . '%']; - } - if ($mobile) { - $map['mobile_phone'] = ['like', '%' . $mobile . '%']; - } - if ($idcard) { - $map['idcard'] = ['like', '%' . $idcard . '%']; - } - if ($realName) { - $map['real_name'] = ['like', '%' . $realName . '%']; - } - if ($status != 'all') { - $map['status'] = ['eq', $status]; - } - $map['parent_id'] = session("promote_auth.pid"); - - $appendCallback = function ($data) { - $promote = new PromoteModel(); - $player = new UserPlayModel(); - $ids = array_column($data, 'id'); - $parentIds = array_column($data, 'parent_id'); - - if (count($ids) == 0) { - return [ - 'hasChildList' => [], - 'hasPlayerList' => [], - 'hasShiftList' => [], - 'hasShiftPlayerList' => [], - 'parentPromotes' => [], - ]; - } - - $parentList = $promote->field(['id', 'account'])->where(['id' => ['in', $parentIds]])->select(); - $parentPromotes = []; - foreach ($parentList as $parent) { - $parentPromotes[$parent['id']] = $parent['account']; - } - - $countList = $promote->field(['count(*)' => 'count', 'parent_id' => 'parent_id'])->where(['parent_id' => ['in', $ids]])->group('parent_id')->select(); - $playerList = $player->field(['count(*)' => 'count', 'promote_id' => 'promote_id'])->where(['promote_id' => ['in', $ids]])->group('promote_id')->select(); - $shiftList = M('ShiftTask')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 1, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); - $shiftPlayerList = M('ShiftTask')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 2, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); - return [ - 'hasChildList' => array_column($countList, 'parent_id'), - 'hasPlayerList' => array_column($playerList, 'promote_id'), - 'hasShiftList' => array_column($shiftList, 'from_promote_id'), - 'hasShiftPlayerList' => array_column($shiftPlayerList, 'from_promote_id'), - 'parentPromotes' => $parentPromotes, - ]; - }; - - $this->assign('subPromotes', $subPromotes); - $this->assign('promotes', $promotes); - parent::lists("Promote", $p, $map, $appendCallback); - } - public function children() { $account = I('account', ''); @@ -975,96 +900,6 @@ class PromoteController extends BaseController $this->display(); } - /** - *子账号 - */ - public function mygrand($p = 0) - { - $account = I('account', ''); - $idcard = I('idcard', ''); - $mobile = I('mobile', ''); - $realName = I('real_name', ''); - $status = I('status', 'all'); - - $promoteId = session("promote_auth.pid"); - $model = new PromoteModel(); - $promotes = $model->field(['id', 'account'])->where('parent_id=' . $promoteId)->select(); - $subPromotes = $model->field(['id', 'account'])->where('parent_id=' . $promoteId . ' or grand_id=' . $promoteId . ' or id=' . $promoteId)->select(); - - $map = []; - if ($account) { - $map['account'] = ['like', '%' . $account . '%']; - } - if ($mobile) { - $map['mobile_phone'] = ['like', '%' . $mobile . '%']; - } - if ($idcard) { - $map['idcard'] = ['like', '%' . $idcard . '%']; - } - if ($realName) { - $map['real_name'] = ['like', '%' . $realName . '%']; - } - if ($status != 'all') { - $map['status'] = ['eq', $status]; - } - - $promote = D('promote')->where(['id' => session('promote_auth.pid')])->find(); - - $isGrand = false; - if ($promote['parent_id'] == 0 && $promote['grand_id'] == 0) { - $map['grand_id'] = session("promote_auth.pid"); - $isGrand = true; - } else { - $map['parent_id'] = session("promote_auth.pid"); - } - - $appendCallback = function ($data) use ($promote) { - $promoteModel = new PromoteModel(); - $player = new UserPlayModel(); - $ids = array_column($data, 'id'); - $parentIds = array_column($data, 'parent_id'); - if (count($ids) == 0) { - return [ - 'hasPlayerList' => [], - 'hasShiftList' => [], - 'hasShiftPlayerList' => [], - 'parentPromotes' => [], - ]; - } - - $parentList = $promoteModel->field(['id', 'account'])->where(['id' => ['in', $parentIds]])->select(); - $parentPromotes = []; - foreach ($parentList as $parent) { - $parentPromotes[$parent['id']] = $parent['account']; - } - - $list = []; - foreach ($data as $key => $item) { - if ($promote['parent_id'] > 0 && $promote['grand_id'] == 0) { - $item['idcard'] = hideStar($item['idcard'], 4, 10); - $item['mobile_phone'] = hideStar($item['mobile_phone'], 3, 4); - } - $list[$key] = $item; - } - - $playerList = $player->field(['count(*)' => 'count', 'promote_id' => 'promote_id'])->where(['promote_id' => ['in', $ids]])->group('promote_id')->select(); - $shiftList = M('ShiftTask')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 1, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); - $shiftPlayerList = M('ShiftTask')->field(['count(*)' => 'count', 'from_promote_id' => 'from_promote_id'])->where(['status' => 0, 'type' => 2, 'promote_id' => ['in', $ids]])->group('from_promote_id')->select(); - return [ - 'list_data' => $list, - 'hasPlayerList' => array_column($playerList, 'promote_id'), - 'hasShiftList' => array_column($shiftList, 'from_promote_id'), - 'hasShiftPlayerList' => array_column($shiftPlayerList, 'from_promote_id'), - 'parentPromotes' => $parentPromotes, - ]; - }; - - $this->assign('isGrand', $isGrand); - $this->assign('subPromotes', $subPromotes); - $this->assign('promotes', $promotes); - parent::lists("Promote", $p, $map, $appendCallback); - } - public function addPromote() { if (IS_POST) { @@ -1076,6 +911,10 @@ class PromoteController extends BaseController $parent = $this->getLoginPromote(); } $promoteService = new PromoteService(); + $result = $promoteService->checkAddPromote($params); + if (!$result['status']) { + $this->ajaxReturn(['status' => 0, 'msg' => $result['message']]); + } $status = $promoteService->addPromote($params, $parent); if ($status) { $this->ajaxReturn(['status' => 1, 'msg' => '添加成功']); @@ -1863,108 +1702,6 @@ class PromoteController extends BaseController } - public function promoteList($p = 1) - { - - switch ($_GET['type']) { - case '': - case 1: - $this->promoteLists($p); - break; - default: - $this->siteApplyList($p); - break; - } - } - -// 推广员列表 - const model_name = 'Promote'; - - public function promoteLists($p) - { - $map = []; - $map['_string'] = 'id=' . session('promote_auth.pid') - . ' or parent_id=' . session('promote_auth.pid') - . ' or grand_id=' . session('promote_auth.pid'); - - $selectMap = $map; - - if (isset($_REQUEST['promote_id'])) { - $promoteid = $_REQUEST['promote_id']; - unset($_REQUEST['promote_id']); - if (isset($_REQUEST['parent_id'])) { - - $parent_id = $_REQUEST['parent_id']; - unset($_REQUEST['parent_id']); - if ($promoteid == $parent_id) { - $map['id'] = $promoteid; - } else { - $maps['parent_id'] = $parent_id; - $maps['grand_id'] = $parent_id; - $maps['_logic'] = 'or'; - $pro = M('promote', 'tab_')->field('id,account')->where([array('id' => $promoteid), $maps])->select(); - - if (!empty($pro_ids)) { - $map['id'] = array('eq', -1); - } - - } - - } else { - $map['id'] = $promoteid; - /* $maps['parent_id'] = $promoteid; - $maps['grand_id'] = $promoteid; - $maps['_logic'] = 'or'; - $pro = M('promote','tab_')->field('id,account')->where($maps)->select(); - $pro_ids = array_column($pro,'id'); - $pro_ids[] = $promoteid; - if (!empty($pro_ids)){ - $map['id'] = ['in',$pro_ids]; - }else{ - $map['id'] = array('eq',-1); - } */ - - } - } else { - if (isset($_REQUEST['parent_id'])) { - if ($_REQUEST['parent_id'] == '全部') { - unset($_REQUEST['parent_id']); - } - $zid = get_zi_promote_id($_REQUEST['parent_id']); - if ($zid) { - $zid = $zid . ',' . $_REQUEST['parent_id']; - } else { - $zid = $_REQUEST['parent_id']; - } - $map['id'] = array('in', $zid); - unset($_REQUEST['parent_id']); - } - } - if (isset($_REQUEST['admin_id'])) { - if ($_REQUEST['admin_id'] == "全部") { - unset($_REQUEST['admin']); - } else { - $map['ba_id'] = $_REQUEST['admin_id']; - } - } - - if (I('promote_level') == 1) { - $map['parent_id'] = 0; - } elseif (I('promote_level') == 2) { - $map['parent_id'] = ['neq', 0]; - $map['grand_id'] = 0; - } elseif (I('promote_level') == 3) { - $map['parent_id'] = ['neq', 0]; - $map['grand_id'] = ['neq', 0]; - } - - $model = new PromoteModel(); - $promotes = $model->field(['id', 'account'])->where($selectMap)->select(); - - $this->assign('promotes', $promotes); - self::order_lists(self::model_name, $p, $map); - } - /** * [数组分页，二维数组字段排序] * @param [type] $model [description] diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 350e5b389..d942b216f 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -716,8 +716,7 @@ class QueryController extends BaseController ]; $ids = M('promote', 'tab_')->where($map)->getField('id', true); - $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']])->select(); - $games = $this->getGamesByPromote($promote); + $games = $this->getGamesByPromote($searchPromote); $params = []; $searchGameName = ''; @@ -776,7 +775,6 @@ class QueryController extends BaseController $timeout = 1; } $this->assign('games', $games); - $this->assign('subPromotes', $subPromotes); $this->assign('timeout', $timeout); $this->assign('records', $records); $this->assign('searchGameName', $searchGameName); @@ -1099,6 +1097,9 @@ class QueryController extends BaseController $params['game_id'] = ['in', $gameIds]; } } + if ($serverId > 0) { + $params['server_id'] = $serverId; + } $params['begin_time'] = $begTime; $params['end_time'] = $endTime; diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index f4c2a7744..f66bf47b3 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -76,7 +76,7 @@',$debug[0]['file'],' ',$debug[0]['line'],PHP_EOL,''; + if (is_object($var) || is_array($var)) { + $mode = 0; + } else { + $mode = 1; + } + switch($mode){ + case 0: print_r($var); break; + case 1: var_dump($var); break; + default: print_r($var); + } + echo '
+
@@ -99,7 +99,7 @@
-
+