"; } } $data['span_str'] = $span_str; } - $this->assign("data",$data); + $this->assign("data", $data); $this->display(); } } - public function delcompanybelonggame() { + public function delcompanybelonggame() + { $id = $_REQUEST["id"]; if (!$id) { - $this->ajaxReturn(['msg'=>"参数传递错误","status"=>0]); + $this->ajaxReturn(['msg' => "参数传递错误", "status" => 0]); } - $data = M("company_belong_game","tab_") - ->where(['id'=>$id]) + $data = M("company_belong_game", "tab_") + ->where(['id' => $id]) ->find(); - if (date("m",$data['begin_time']) < date("m",strtotime('-1 month'))) { - $this->ajaxReturn(['msg'=>"过去已结算过的比例不能删除","status"=>0]); + if (date("m", $data['begin_time']) < date("m", strtotime('-1 month'))) { + $this->ajaxReturn(['msg' => "过去已结算过的比例不能删除", "status" => 0]); } - $is_del = M("company_belong_game","tab_") - ->where(['id'=>$id]) + $is_del = M("company_belong_game", "tab_") + ->where(['id' => $id]) ->delete(); if ($is_del) { - $this->ajaxReturn(['msg'=>"删除成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上","status"=>1]); + $this->ajaxReturn(['msg' => "删除成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上", "status" => 1]); } else { - $this->ajaxReturn(['msg'=>"删除失败","status"=>0]); + $this->ajaxReturn(['msg' => "删除失败", "status" => 0]); } } - public function showGame() { + public function showGame() + { $data = $_REQUEST; if (!$data['game_ids']) { - $this->ajaxReturn(['msg'=>"请选择游戏后点击确定","status"=>0]); + $this->ajaxReturn(['msg' => "请选择游戏后点击确定", "status" => 0]); } - $game_data = M("game","tab_") + $game_data = M("game", "tab_") ->field("relation_game_name,relation_game_id,game_type_name") - ->where(['relation_game_id'=>['in',$data['game_ids']]]) + ->where(['relation_game_id' => ['in', $data['game_ids']]]) ->group("relation_game_id") ->select(); - $this->ajaxReturn(['msg'=>"选择游戏成功","status"=>1,"data"=>$game_data]); + $this->ajaxReturn(['msg' => "选择游戏成功", "status" => 1, "data" => $game_data]); } @@ -1956,7 +1985,7 @@ class MarketPercentageController extends ThinkController $games = M('game', 'tab_') ->field('relation_game_id id,relation_game_name game_name,short') - ->where(['game_status'=>1]) + ->where(['game_status' => 1]) ->group("relation_game_id") ->select(); $data['data']['game_list'] = empty($games) ? '' : $games; @@ -1969,4 +1998,32 @@ class MarketPercentageController extends ThinkController } } + //模板导出 + public function downloadCoefficient() + { + header("Content-type: text/html; charset=utf-8"); + error_reporting(E_ALL); + ini_set('display_errors', TRUE); + ini_set('display_startup_errors', TRUE); + + define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); + + Vendor("PHPExcel.PHPExcel"); + $objPHPExcel = new \PHPExcel(); + $objReader = \PHPExcel_IOFactory::createReader('Excel2007'); + + //设置模板文件 + $objPHPExcel = $objReader->load("Public/Admin/excel/coefficient.xlsx"); + + $fileName = "绩效导入模板"; + + ob_end_clean();//清除缓冲区,避免乱码 + header('pragma:public'); + header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls'); + header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印 + $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); + $objWriter->save('php://output'); + exit; + } + } diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php index 1693bf77a..f9d2a5551 100644 --- a/Application/Admin/Controller/OldCountController.class.php +++ b/Application/Admin/Controller/OldCountController.class.php @@ -358,20 +358,35 @@ class OldCountController extends \Think\Controller public function oldRewardChange() { $data = M("company_lack_statement_info","tab_") - ->where("(fine > 0 or reward > 0) and company_type = 2") + ->where("(fine > 0 or reward > 0) and company_type != 2") ->select(); foreach ($data as $key => $value) { $statement_info = json_decode($value['statement_info'],true); - $statement_info[0]['game_list'][0]['fine'] = $value['fine']; - $statement_info[0]['game_list'][0]['reward'] = $value['reward']; + $statement_info[0]['fine'] = $value['fine']; + $statement_info[0]['reward'] = $value['reward']; $statement_info = json_encode($statement_info); M("company_lack_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]); } + $data = M("company_statement_info","tab_") + ->where("(fine > 0 or reward > 0) and company_type != 2") + ->select(); + + foreach ($data as $key => $value) { + + $statement_info = json_decode($value['statement_info'],true); + $statement_info[0]['fine'] = $value['fine']; + $statement_info[0]['reward'] = $value['reward']; + $statement_info = json_encode($statement_info); + + M("company_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]); + + } + echo "success"; } diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php index dddf65b1c..a1fbcc8d5 100644 --- a/Application/Admin/Controller/SocietyInfoController.class.php +++ b/Application/Admin/Controller/SocietyInfoController.class.php @@ -14,6 +14,12 @@ class SocietyInfoController extends ThinkController { private $modelName = 'SocietyInfo'; private $admininfo = ''; + private $level = [ + 1=>'S', + 2=>'A', + 3=>'B', + 4=>'其他' + ]; public function _initialize() { @@ -32,6 +38,14 @@ class SocietyInfoController extends ThinkController $map['create_account'] = $this->admininfo['username']; } + if ($_REQUEST['text']) { + $map['_string'] = "province like '%{$_REQUEST['text']}%' or city like '%{$_REQUEST['text']}%' + or company_name like '%{$_REQUEST['text']}%' or register_capital like '%{$_REQUEST['text']}%' or functionary like '%{$_REQUEST['text']}%' + or phone like '%{$_REQUEST['text']}%' or wechat like '%{$_REQUEST['text']}%' or qq like '%{$_REQUEST['text']}%' or game_type like '%{$_REQUEST['text']}%' + or game_name like '%{$_REQUEST['text']}%' or join_platform like '%{$_REQUEST['text']}%' or promote_scale like '%{$_REQUEST['text']}%' or turnover= '{$_REQUEST['text']}' + or address like '%{$_REQUEST['text']}%' or league_info like '%{$_REQUEST['text']}%' or remark like '%{$_REQUEST['text']}%' or interface_person like '%{$_REQUEST['text']}%'"; + } + $page = intval(I('get.p', 0)); $page = $page ? $page : 1; //默认显示第一页数据 $row = intval(I('row', 0)); @@ -56,14 +70,17 @@ class SocietyInfoController extends ThinkController if (I('time_gap', -1) == 0) { $map['communication_time'] = array('elt', time() - $gap * 86400); } + if (I('sociaty_level') && I('sociaty_level') != '0') $map['sociaty_level'] = I('sociaty_level'); //获取分页数据 - $query = $model->where($map)->order("id desc"); + $query = $model->where($map)->order("communication_time desc"); $count = $query->count(); if($is_export){ - $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account") + $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale,sociaty_level, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account") ->where($map) + ->order("communication_time desc") ->select(); foreach ($parseData as &$v) { + $v['sociaty_level'] = $this->level[$v['sociaty_level']]; if ($v['is_potential'] == 1) $v['is_potential'] = "是"; else $v['is_potential'] = "否"; $v['communication_time'] = date('Y-m-d H:i:s', $v['communication_time']); @@ -74,11 +91,12 @@ class SocietyInfoController extends ThinkController } addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME, I('get.*')),'menu'=>"推广-公会信息-导出"]); $head = ["省份", "城市", "公司", "注册资本", "负责人", "电话", "微信", "QQ", "游戏类型", "所做游戏", - "合作平台", "推广规模", "流水", "地址", "联盟信息", "是否为意向客户", "备注信息", "对接人", "录入时间", "最后沟通时间", "录入员"]; + "合作平台", "推广规模", "公会等级", "流水", "地址", "联盟信息", "是否为意向客户", "备注信息", "对接人", "录入时间", "最后沟通时间", "录入员"]; $this->export($head, $parseData, "公会信息-".date('Ymd')); return ; } else { - $societyInfos = $model->where($map)->order("id desc")->field("*")->page($page,$row)->select(); + $societyInfos = $model->where($map)->order("communication_time desc")->field("*")->page($page,$row)->select(); +// dump($societyInfos);die(); } //分页 @@ -90,13 +108,31 @@ class SocietyInfoController extends ThinkController $this->assign('_page', $page); } - foreach ($societyInfos as &$v) { - if (time() - $v['communication_time'] > $gap * 86400) + foreach ($societyInfos as $k => &$v) { + + $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row; + $v['sociaty_level_str'] = $this->level[$v['sociaty_level']]; + + if (time() - $v['communication_time'] > $gap * 86400 + && $v['is_potential'] == 1 + ) $v['is_gap_time'] = 1; + + if($gap == 0 && $v['communication_time']!=$v['create_time']) { + $v['is_gap_time'] = 0; + } } $this->checkListOrCountAuthRestMap($map,[]); - $this->assign('timeset_check',$this->checkRule("Admin/SocietyInfo/timeset" ,array('in','1,2'))); + + if (IS_ROOT) { + $this->assign('timeset_check',true); + $this->assign('delset_check',true); + } else { + $this->assign('timeset_check',$this->checkRule("Admin/SocietyInfo/timeset" ,array('in','1,2'))); + $this->assign('delset_check',$this->checkRule("Admin/SocietyInfo/delset" ,array('in','1,2'))); + } + // $this->assign('time_gap', $config['value']); $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select(); @@ -212,7 +248,6 @@ class SocietyInfoController extends ThinkController } $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司'; - $contract_start_time = $v['partner_info']['contract_start_time'] ? time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-'; if($v['partner_info']['contract_start_time']){ $contract_end_time = $v['partner_info']['contract_end_time'] ? date('Y/m/d', $v['partner_info']['contract_end_time']) : '永久'; @@ -269,9 +304,24 @@ class SocietyInfoController extends ThinkController if ($_POST) { $save = I("post."); + if (empty($save['province'])) { + $this->error("省份为必填项"); + } + if (empty($save['city'])) { + $this->error("城市为必填项"); + } if (empty($save['company_name'])) { $this->error("公司为必填项"); } + if (empty($save['game_types'])) { + $this->error("游戏类型为必填项"); + } + foreach ($save['game_types'] as $v) { + $save['game_type'] .= $v . "/"; + } + + $save['game_type'] = trim($save['game_type'], '/'); +// dump($save['game_type']);die(); if ($save['province'] == "请选择省份") $save['province'] = ''; if ($save['city'] == "请选择城市") $save['city'] = ''; foreach ($save['game_types'] as $v) { @@ -306,6 +356,15 @@ class SocietyInfoController extends ThinkController $save['province'] = ''; $save['city'] = ''; } + if (empty($save['city'])) { + $this->error("城市为必填项"); + } + if (empty($save['company_name'])) { + $this->error("公司为必填项"); + } + if (empty($save['game_type'])) { + $this->error("游戏类型为必填项"); + } $save['game_type'] = trim($save['game_type'], '/'); $save['communication_time'] = time(); @@ -349,6 +408,35 @@ class SocietyInfoController extends ThinkController } } + //查看 + public function view() + { + $model = M($this->modelName, 'tab_'); + + + $id = intval(I('get.id', 0)); + $map['id'] = $id; + $data = $model->find($id); + if (empty($data)) { + $this->error('数据异常', U('lists')); + } + $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select(); + $myGameTypes = explode('/', $data['game_type']); + foreach ($gameTypes as &$v) { + $v['check'] = 0; + foreach ($myGameTypes as $item) { + if ($item == $v['type_name']) { + $v['check'] = 1; + } + } + } + + $this->assign("game_types", $gameTypes); + $this->assign('data', $data); + $this->meta_title = '编辑'; + $this->display(); + } + //删除 public function del() { @@ -376,8 +464,40 @@ class SocietyInfoController extends ThinkController $this->success('删除成功', U('lists')); } + //批量删除 + public function del_check() { + if (!empty($_POST['ids'])) { + if (!is_array($_POST['ids'])) { + $this->ajaxReturn(['status'=>0,'info'=>'参数异常']); +// $this->error('参数异常'); + } + + $id = implode(',', $_POST['ids']); + } else { + $id = intval(I('get.id', 0)); + if ($id == 0) { + $this->ajaxReturn(['status'=>0,'info'=>'参数异常']); +// $this->error('参数异常'); + } + } + $res = M($this->modelName, 'tab_')->delete($id); + if ($res === false) { +// $this->error('删除失败'); + $this->ajaxReturn(['status'=>0,'info'=>'删除失败']); + } + addOperationLog(array( + "op_type"=>2, + "key"=>$id, + "url"=>U("Society/lists") + )); + + $this->ajaxReturn(['status'=>1,'info'=>'删除成功']); + + } + // 导入 public function excelImport() { + header("Content-Type:text/html;charset=utf-8"); $upload = new \Think\Upload();// 实例化上传类 $upload->maxSize = 3145728 ;// 设置附件上传大小 @@ -388,8 +508,10 @@ class SocietyInfoController extends ThinkController $info = $upload->uploadOne($_FILES['excelData']); $filename = './Uploads/'.$info['savepath'].$info['savename']; $exts = $info['ext']; + if(!$info) {// 上传错误提示错误信息 - $this->error($upload->getError()); + $this->ajaxReturn(['msg'=>$upload->getError(),"status"=>0]); +// $this->error($upload->getError()); } // 上传成功 $datas = $this->parseExcelIn($filename, $exts); @@ -404,68 +526,88 @@ class SocietyInfoController extends ThinkController if ($flag == 0) continue; if ($k == 1) continue; $inserts[$k-2]['province'] = $v['A'] ?? ''; + if (!$v['A']) { + $this->ajaxReturn(['msg'=>"省份不能为空".$k,"status"=>0]); + } + $inserts[$k-2]['city'] = $v['B'] ?? ''; + if (!$v['B']) { + $this->ajaxReturn(['msg'=>"城市不能为空".$k,"status"=>0]); + } + $inserts[$k-2]['company_name'] = $v['C'] ?? ''; if (mb_strlen($inserts[$k-2]['company_name'], "utf-8") > 100) { - $this->error("公司名太长".$k); + $this->ajaxReturn(['msg'=>"公司名太长".$k,"status"=>0]); } if (!$inserts[$k-2]['company_name']) { - $this->error("公司不能为空".$k); + $this->ajaxReturn(['msg'=>"公司不能为空".$k,"status"=>0]); } $inserts[$k-2]['register_capital'] = $v['D'] ?? ''; if (strlen($inserts[$k-2]['register_capital']) > 50) { - $this->error("推荐人太长".$k); + $this->ajaxReturn(['msg'=>"推荐人太长".$k,"status"=>0]); } $inserts[$k-2]['functionary'] = $v['E'] ?? ''; if (strlen($inserts[$k-2]['functionary']) > 50) { - $this->error("负责人太长".$k); + $this->ajaxReturn(['msg'=>"负责人太长".$k,"status"=>0]); } $inserts[$k-2]['phone'] = $v['F'] ?? ''; if (strlen($inserts[$k-2]['phone']) > 50) { - $this->error("手机号太长".$k); + $this->ajaxReturn(['msg'=>"手机号太长".$k,"status"=>0]); } $inserts[$k-2]['wechat'] = $v['G'] ?? ''; if (strlen($inserts[$k-2]['wechat']) > 50) { - $this->error("微信号太长".$k); + $this->ajaxReturn(['msg'=>"微信号太长".$k,"status"=>0]); } $inserts[$k-2]['qq'] = $v['H'] ?? ''; if (strlen($inserts[$k-2]['qq']) > 50) { - $this->error("qq号太长".$k); + $this->ajaxReturn(['msg'=>"qq号太长".$k,"status"=>0]); } $inserts[$k-2]['game_type'] = $v['I'] ?? ''; $inserts[$k-2]['game_name'] = $v['J'] ?? ''; if (strlen($inserts[$k-2]['game_name']) > 50) { - $this->error("游戏名太长".$k); + $this->ajaxReturn(['msg'=>"游戏名太长".$k,"status"=>0]); } $inserts[$k-2]['join_platform'] = $v['K'] ?? ''; if (strlen($inserts[$k-2]['join_platform']) > 50) { - $this->error("合作平台太长".$k); + $this->ajaxReturn(['msg'=>"合作平台太长".$k,"status"=>0]); } $inserts[$k-2]['promote_scale'] = $v['L'] ?? ''; if (strlen($inserts[$k-2]['promote_scale']) > 50) { - $this->error("推广规模太长".$k); + $this->ajaxReturn(['msg'=>"推广规模太长".$k,"status"=>0]); } + $inserts[$k-2]['turnover'] = $v['M'] ?? ''; if (strlen($inserts[$k-2]['turnover']) > 50) { - $this->error("流水太长".$k); + $this->ajaxReturn(['msg'=>"公会等级".$k,"status"=>0]); + } + + $inserts[$k-2]['turnover'] = $v['N'] ?? ''; + if (strlen($inserts[$k-2]['turnover']) > 50) { + $this->ajaxReturn(['msg'=>"流水太长".$k,"status"=>0]); } - $inserts[$k-2]['address'] = $v['N'] ?? ''; + $inserts[$k-2]['address'] = $v['O'] ?? ''; if (mb_strlen($inserts[$k-2]['address'], 'utf-8') > 100) { - $this->error("地址太长".$k); + $this->ajaxReturn(['msg'=>"地址太长".$k,"status"=>0]); } - $inserts[$k-2]['league_info'] = $v['O'] ?? ''; + $inserts[$k-2]['league_info'] = $v['P'] ?? ''; if (strlen($inserts[$k-2]['league_info']) > 100) { - $this->error("联盟信息太长".$k); + $this->ajaxReturn(['msg'=>"联盟信息太长".$k,"status"=>0]); } - $inserts[$k-2]['is_potential'] = $v['P']=="是" ? 1 : 0; - $inserts[$k-2]['remark'] = $v['Q'] ?? ''; + if ($v['Q']) { + $inserts[$k-2]['is_potential'] = ($v['Q']=="是" ? 1 : 0); + } else { + $inserts[$k-2]['is_potential'] = 1; + } + + $inserts[$k-2]['remark'] = $v['R'] ?? ''; if (strlen($inserts[$k-2]['remark']) > 100) { - $this->error("备注太长".$k); + $this->ajaxReturn(['msg'=>"备注太长".$k,"status"=>0]); } - $inserts[$k-2]['interface_person'] = $v['R'] ?? ''; + $inserts[$k-2]['interface_person'] = $v['S'] ?? ''; if (strlen($inserts[$k-2]['interface_person']) > 50) { - $this->error("对接人太长".$k); + $this->ajaxReturn(['msg'=>"对接人太长".$k,"status"=>0]); } + $inserts[$k-2]['create_time'] = time(); $inserts[$k-2]['update_time'] = time(); $inserts[$k-2]['communication_time'] = time(); @@ -474,13 +616,14 @@ class SocietyInfoController extends ThinkController $gameTypes = explode('/', $v['I']); foreach ($gameTypes as $gameType) { if (!M('game_type', 'tab_')->where(["type_name" => $gameType])->find()) { - $this->error("游戏类型有误：{$gameType}"); + $this->ajaxReturn(['msg'=>"游戏类型有误：{$gameType}","status"=>0]); return; } } } M('society_info', 'tab_')->addAll($inserts); - $this->success("导入成功"); + $this->ajaxReturn(['msg'=>"导入成功","status"=>1]); +// $this->success("导入成功"); } private function parseExcelIn($filename, $exts) { @@ -521,4 +664,32 @@ class SocietyInfoController extends ThinkController return $data; } + //模板导出 + public function downloadSocial() + { + header("Content-type: text/html; charset=utf-8"); + error_reporting(E_ALL); + ini_set('display_errors', TRUE); + ini_set('display_startup_errors', TRUE); + + define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); + + Vendor("PHPExcel.PHPExcel"); + $objPHPExcel = new \PHPExcel(); + $objReader = \PHPExcel_IOFactory::createReader('Excel2007'); + + //设置模板文件 + $objPHPExcel = $objReader->load("Public/Admin/excel/social_template.xls"); + + $fileName = "公会信息模板"; + + ob_end_clean();//清除缓冲区,避免乱码 + header('pragma:public'); + header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls'); + header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印 + $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); + $objWriter->save('php://output'); + exit; + } + } diff --git a/Application/Admin/Controller/TestingResourceController.class.php b/Application/Admin/Controller/TestingResourceController.class.php index 581ecf923..c6baeacc9 100644 --- a/Application/Admin/Controller/TestingResourceController.class.php +++ b/Application/Admin/Controller/TestingResourceController.class.php @@ -243,6 +243,126 @@ class TestingResourceController extends ThinkController $this->assign('records', $records); $this->display(); } + public function indexDailyCountTip() + { + $tipApply = 10000; + $params = [ + 'create_time_start'=>date("Y-m-d",strtotime("-1 day")), + 'create_time_end'=>date("Y-m-d",time()), + ]; + $where = $this->setDailyCountWhere($params); + $having = 'apply_amount >= '.$tipApply; + $dbdata = M('testing_resource_batch','tab_') + ->where($where)->field("FROM_UNIXTIME(create_time,'%Y-%m-%d') as create_day_time,user_id,role_id,game_id,apply_promote_id,apply_admin_id,verify_admin_id,sum(apply_amount) apply_amount,sum(provide_amount) provide_amount") + ->group("role_id,game_id,create_day_time") + ->order("create_day_time desc") + ->having($having) + ->select(); + $repository = new TestingResourceRepository(); + $records = $repository->makeDailyCountTipData($dbdata); + //获取跳转连接 + $jumpParm = [ + 'apply_amount_start'=>$tipApply, + 'create_time_start'=>$params['create_time_start'], + 'create_time_end'=>$params['create_time_end'] + ]; + $jumpUrl = U("TestingResource/dailyCount",$jumpParm); + $this->ajaxReturn(['status'=>1,'count'=>count($records),'list'=>$records,'jump'=>$jumpUrl]); + } + //每日统计 + public function dailyCount() + { + $page = I('p', 1); + $row = I('row', 10); + $params = I('get.'); + + if(!array_key_exists("create_time_start",$params) && !array_key_exists("create_time_end",$params)){ + $this->redirect(ACTION_NAME, array('create_time_start' => date('Y-m-d'),"create_time_end"=>date('Y-m-d'))); + } + + $where = $this->setDailyCountWhere($params); + $having = '1=1'; + isset($params['apply_amount_start']) && !empty($params['apply_amount_start']) && ( $having .= ' and apply_amount >=' . $params['apply_amount_start']); + isset($params['apply_amount_end']) && !empty($params['apply_amount_end']) && ( $having .= ' and apply_amount <=' . $params['apply_amount_end']); + + $isExport = $params['export'] ?? 0; + $query = M('testing_resource_batch','tab_') + ->where($where)->field("FROM_UNIXTIME(create_time,'%Y-%m-%d') as create_day_time,user_id,role_id,game_id,apply_promote_id,apply_admin_id,verify_admin_id,sum(apply_amount) apply_amount,sum(provide_amount) provide_amount") + ->group("role_id,game_id,create_day_time") + ->order("apply_amount desc,create_day_time desc") + ->having($having); + $countsql = clone $query; + if(empty($isExport)){ + $dbdata= $query->page($page,$row)->select(); + $count = M()->table('('.$countsql->select(false).') a')->count(); + }else{ + $dbdata= $query->select(); + } + $repository = new TestingResourceRepository(); + $records = $repository->makeDailyCountData($dbdata); + + $pagination = set_pagination($count, $row); + $gameRepository = new GameRepository(); + $gameId = $params['game_id'] ?? 0; + $this->assign('games', $gameRepository->getChoiceGames()); + $this->assign('count', $count); + $this->assign('_page', $pagination); + $this->assign('records', $records); + $this->display(); + } + protected function setDailyCountWhere($params) + { + $where['_string'] = '1 = 1'; + isset($params['game_id']) && !empty($params['game_id']) && ($where['game_id'] = $params['game_id']); + isset($params['server_id']) && !empty($params['server_id']) && ($where['server_id'] = $params['server_id']); + if (isset($params['account']) && !empty($params['account'])) { + $user = M('user', 'tab_')->field(['id'])->where('account like "' . $params['account'] . '%"')->getField('id',true); + if (!empty($user)) { + $where['user_id'] = ['in',$user]; + } else { + $where['_string'] .= ' and 1<>1'; + return $where; + } + } + isset($params['create_time_start']) && !empty($params['create_time_start']) && ( $where['_string'] .= ' and create_time >=' . strtotime($params['create_time_start'] . ' 00:00:00')); + isset($params['create_time_end']) && !empty($params['create_time_end']) && ( $where['_string'] .= ' and create_time <=' . strtotime($params['create_time_end'] . ' 23:59:59')); + if (isset($params['role_name']) && !empty($params['role_name']) ) { + $roles = M('user_play_info', 'tab_')->where(['role_name' => ['like', "%{$params['role_name']}%"]])->getField('role_id',true); + if(!empty($roles)){ + $where['role_id'] = ["in",$roles]; + }else{ + $where['_string'] .= ' and 1<>1'; + return $where; + } + } + if (isset($params['apply_name']) && !empty($params['apply_name'])) { + $promote = M('promote', 'tab_')->where(['account' => ['like', "%{$params['apply_name']}%"]])->getField('id',true); + $applyAdmins = M('ucenter_member', 'sys_')->where(['username' => ['like', "%{$params['apply_name']}%"]])->getField('id',true); + if(empty($promote) && empty($applyAdmins)){ + $where['_string'] .= ' and 1<>1'; + return $where; + } + if(!empty($promote)){ + $promote = implode(",",$promote); + if(empty($applyAdmins)){ + $where['_string'] .= " and apply_promote_id in ({$promote })"; + }else{ + $where['_string'] .= " and ( apply_promote_id in ({$promote })"; + } + } + if(!empty($applyAdmins)){ + $applyAdmins = implode(",",$applyAdmins); + if(empty($promote)){ + $where['_string'] .= " and apply_admin_id in ({$applyAdmins}) "; + }else{ + $where['_string'] .= " or apply_admin_id in ({$applyAdmins}) )"; + } + } + } + return $where; + } + + public function orders() { diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 5f50f2acc..b500187f7 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -10,6 +10,7 @@ namespace Admin\Controller; use User\Api\UserApi as UserApi; use function GuzzleHttp\Psr7\str; +use Base\Factory\BaseFactory; /** * 后台首页控制器 @@ -1545,4 +1546,13 @@ class TimingController extends AdminController { } + //离职定时器 + public function timingleaveMarketMember() { + + $instance = BaseFactory::getInstance(); + $leavePercentageInstance = $instance->factoryClass("LeavePercentage"); + + $leavePercentageInstance->leaveTiming(); + } + } diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 6d3013b5f..c935e31fa 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -31,6 +31,11 @@ class UserController extends AdminController if (isset($_REQUEST['status'])) { $map['status'] = $_REQUEST['status']; } + + if(isset($_REQUEST['real_name'])) { + $map['real_name'] = $_REQUEST['real_name']; + } + if (is_numeric($nickname)) { $map['uid|nickname'] = array(intval($nickname), array('like', '%' . $nickname . '%'), '_multi' => true); } else { @@ -389,6 +394,22 @@ class UserController extends AdminController } } + if (strtotime($_POST['apply_leave_time'])
+
+
+
+
diff --git a/Application/Admin/View/CompanyStatementPool/editPcPool.html b/Application/Admin/View/CompanyStatementPool/editPcPool.html
new file mode 100644
index 000000000..9b1197055
--- /dev/null
+++ b/Application/Admin/View/CompanyStatementPool/editPcPool.html
@@ -0,0 +1,687 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html
index ee6569fe4..90bc0dee3 100644
--- a/Application/Admin/View/CompanyStatementPool/editPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html
@@ -166,19 +166,42 @@
+
+
+
+
+
+
+
+
- {$data.payment}
+ class="unPayment" style="color:blue" data-id="{$data['id']}">{$data.payment}
@@ -306,6 +306,19 @@
});
});
+ $(".unPayment").click(function () {
+ var id = $(this).data("id");
+ var url = "{:U('viewUnPaymentPool')}"+"&id="+id
+ layer.open({
+ type: 2,
+ title: "海南万盟天下科技有限公司",
+ shadeClose: true,
+ shade: 0.8,
+ area: ['100%', '100%'],
+ content: url
+ });
+ });
+
$(".editPool").click(function () {
var id = $(this).data("id");
var url = "{:U('editPool')}"+"&id="+id
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
index 42b844d8a..c4268d24f 100644
--- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
@@ -103,6 +103,7 @@
+ {$pool_data.firstverify}
+
+
+ {$pool_data.firstverify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.payment}
+
+
+ {$pool_data.payment}
+
+
+ {$pool_data.firstverify}
+
+
+ {$pool_data.firstverify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.payment}
+
+
+ {$pool_data.payment}
+
+
+ {$pool_data.firstverify}
+
+
+ {$pool_data.firstverify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.verify}
+
+
+ {$pool_data.payment}
+
+
+ {$pool_data.payment}
+
+
@@ -261,14 +264,173 @@
-
+
+
+
+
+
+
+
+
+ {$meta_title}
+
+
+
+
+
+ 
+
+ 已添加
+
+
+
+
+
+
+ 测试资源申请统计
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 申请日期 | +角色名称 | +游戏名称 | +区服名称 | +测试账号 | +申请人 | +所属推广员 | +总申请金额 | +实发金额 | +操作 | +aOh! 暂时还没有内容! | +
|---|---|---|---|---|---|---|---|---|---|
| {$record.create_day_time} | +{$record.role_name} | +{$record.game_name} | +{$record.server_name} | +{$record.user_account} | +{$record.apply_username} | +{$record.promote_account} | +{$record.apply_amount} | +{$record.provide_amount} | ++ 查看 + | +
+
+
+
+ {$_page|default=''}
+
+
+
@@ -134,6 +151,29 @@
-
+