diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index ddaa43430..cc7e5adef 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -923,3 +923,44 @@ function getGameTypeName($id,$chinese=true) } } + +/** + * 权限检测 + * @param string $rule 检测的规则 + * @param string $mode check模式 + * @return boolean + * @author 朱亚杰 + */ +use Admin\Model\AuthRuleModel; +function checkRule($rule, $type=AuthRuleModel::RULE_URL, $mode='url'){ + static $Auth = null; + if (!$Auth) { + $Auth = new \Think\Auth(); + } + + if(!$Auth->check($rule,is_login(),$type,$mode)){ + return false; + } + + return true; +} +/** + * 验证导出账号权限是否加密 + * @param [type] $type 0:"_list_check",1:"_count_check" + * @return void + */ +function checkEncryptionAuth(&$value,$string){ + //验证count + if(is_administrator()){ + return true; + }else{ + $exportRule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.$string."_encryption_check"); + + if (!checkRule($exportRule,array('in','1,2'))) { +// dump(1);die(); + $value = encryption($value); + } + + } +} + diff --git a/Application/Admin/Controller/ActionController.class.php b/Application/Admin/Controller/ActionController.class.php index f4ffd6321..7587efb10 100644 --- a/Application/Admin/Controller/ActionController.class.php +++ b/Application/Admin/Controller/ActionController.class.php @@ -28,6 +28,9 @@ class ActionController extends AdminController { $model_id = get_document_field($value['model'],"name","id"); $list[$key]['model_id'] = $model_id ? $model_id : 0; } + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('_list', $list); $this->meta_title = '行为日志'; diff --git a/Application/Admin/Controller/AdminController.class.php b/Application/Admin/Controller/AdminController.class.php index 83775c3fb..098245e36 100644 --- a/Application/Admin/Controller/AdminController.class.php +++ b/Application/Admin/Controller/AdminController.class.php @@ -639,9 +639,16 @@ class AdminController extends Controller { */ public function checkListOrCountAuthRestMap(&$map,$checkarr = false,$countfield = "rule_count_check"){ //验证count - if(IS_ROOT){ + if(IS_ROOT){ + $this->assign('role_export_check',true); $this->assign($countfield,true); }else{ + $exportRule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_export_check"); + +// var_dump($this->checkRule($exportRule,array('in','1,2')));die(); + + $this->assign('role_export_check',$this->checkRule($exportRule,array('in','1,2'))); + $countRule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_count_check"); $this->assign($countfield,$this->checkRule($countRule,array('in','1,2'))); //验证list diff --git a/Application/Admin/Controller/AmericaIpForbitController.class.php b/Application/Admin/Controller/AmericaIpForbitController.class.php index 0e21ff13d..6962e50c6 100644 --- a/Application/Admin/Controller/AmericaIpForbitController.class.php +++ b/Application/Admin/Controller/AmericaIpForbitController.class.php @@ -43,6 +43,7 @@ class AmericaIpForbitController extends ThinkController $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?1:0; + $this->checkListOrCountAuthRestMap($map,[]); $page = set_pagination($count, $row); diff --git a/Application/Admin/Controller/ApplyController.class.php b/Application/Admin/Controller/ApplyController.class.php index cc211f8c2..575d541eb 100644 --- a/Application/Admin/Controller/ApplyController.class.php +++ b/Application/Admin/Controller/ApplyController.class.php @@ -94,6 +94,9 @@ class ApplyController extends ThinkController if ($page) { $this -> assign('_page', $page); } + + $this->checkListOrCountAuthRestMap($map,[]); + $this -> assign('list_data', $data); $this -> meta_title = 'APP分包'; $this -> m_title = '游戏盒子APP分包'; @@ -176,6 +179,9 @@ class ApplyController extends ThinkController $listdata[$k]['launch_count'] = $launchmodel -> where(['apply_id' => $v['id']]) -> count(); } + + $this->checkListOrCountAuthRestMap($map,[]); + $this -> assign('list_data', $listdata); $this -> m_title = '游戏分包'; $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'Apply/and_lists', 'status' => 1]) -> find()); diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 94dd862f8..f5552eed9 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -95,7 +95,8 @@ class AuthManagerController extends AdminController{ $this->assign( '_list', $list ); $this->assign( '_use_tip', true ); $this->meta_title = '权限管理'; - + + $this->checkListOrCountAuthRestMap($map,[]); $this->m_title = '角色权限'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'AuthManager/index','status'=>1])->find()); diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 470ae342a..3ffafeb7a 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -77,6 +77,7 @@ class BehaviorLogController extends ThinkController } } + $this->checkListOrCountAuthRestMap($map,[]); $count = M('pay_info', 'tab_')->where($map)->count(); $page = set_pagination($count, $row); if ($page) { @@ -159,6 +160,7 @@ class BehaviorLogController extends ThinkController } else { $count = M('repair_pay', 'tab_')->where($map)->count(); } + $this->checkListOrCountAuthRestMap($map,[]); $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); diff --git a/Application/Admin/Controller/BindRechargeRecordController.class.php b/Application/Admin/Controller/BindRechargeRecordController.class.php index c51dcd04b..0ede8cefa 100644 --- a/Application/Admin/Controller/BindRechargeRecordController.class.php +++ b/Application/Admin/Controller/BindRechargeRecordController.class.php @@ -47,6 +47,7 @@ class BindRechargeRecordController extends ThinkController{ // $map['id'] = array('lt',1); // } setPowerPromoteIds($map,'promote_id'); + $this->checkListOrCountAuthRestMap($map,[]); empty(I('pay_order_number')) || $map['pay_order_number'] = I('pay_order_number',''); $data = $model->getLists($map,"create_time desc",$p); diff --git a/Application/Admin/Controller/BusinessAffairsController.class.php b/Application/Admin/Controller/BusinessAffairsController.class.php index d91907d3a..3b91727cf 100644 --- a/Application/Admin/Controller/BusinessAffairsController.class.php +++ b/Application/Admin/Controller/BusinessAffairsController.class.php @@ -25,6 +25,7 @@ class BusinessAffairsController extends ThinkController $this->m_title = '商务专员'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'BusinessAffairs/lists','status'=>1])->find()); + $this->checkListOrCountAuthRestMap($map,[]); unset($_REQUEST['phone']); parent::order_lists("BusinessAffairs", $_GET["p"], $map); @@ -258,7 +259,7 @@ class BusinessAffairsController extends ThinkController $this->m_title = '商务专员汇总查询'; $this->meta_title = '汇总查询'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'BusinessAffairs/summaryQuery','status'=>1])->find()); - + $this->checkListOrCountAuthRestMap($map,[]); $this->display(); } diff --git a/Application/Admin/Controller/DeductBindRecordController.class.php b/Application/Admin/Controller/DeductBindRecordController.class.php index ce179b50d..7499a15f6 100644 --- a/Application/Admin/Controller/DeductBindRecordController.class.php +++ b/Application/Admin/Controller/DeductBindRecordController.class.php @@ -29,7 +29,7 @@ class DeductBindRecordController extends ThinkController { $sum['yst_day'] = D($model_name)->where($map)->sum('quantity'); $sum['all_num'] = D($model_name)->where($extend)->sum('quantity'); - + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('sum',$sum); $this->m_title = '绑币收回'; diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php index 39f134794..e838bb7c9 100644 --- a/Application/Admin/Controller/DepositController.class.php +++ b/Application/Admin/Controller/DepositController.class.php @@ -128,7 +128,7 @@ class DepositController extends ThinkController { // $this->meta_title = '平台币充值列表'; // $this->display('lists');die(); // } - + $this->checkListOrCountAuthRestMap($map,[]); $total=null_to_0(D(self::model_name)->where($map1)->sum('pay_amount')); $ttotal=null_to_0(D(self::model_name)->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount')); $ytotal=null_to_0(D(self::model_name)->where('create_time'.total(5))->where(array('pay_status'=>1))->sum('pay_amount')); @@ -245,6 +245,8 @@ class DepositController extends ThinkController { /* 执行查询 */ ->select(); + $this->checkListOrCountAuthRestMap($map,[]); + /* 查询记录总数 */ $count = D('coin_pay_order')->where($map)->count(); diff --git a/Application/Admin/Controller/DevelopersController.class.php b/Application/Admin/Controller/DevelopersController.class.php index 3cf7873b7..2f5550c8c 100644 --- a/Application/Admin/Controller/DevelopersController.class.php +++ b/Application/Admin/Controller/DevelopersController.class.php @@ -40,7 +40,7 @@ class DevelopersController extends ThinkController { 'template_list' =>'lists', 'order'=>'id desc', ); - + $this->checkListOrCountAuthRestMap($map,[]); $this->m_title = '开发者列表'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Developers/lists','status'=>1])->find()); diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 82eb0728a..f0eac80a3 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1219,6 +1219,9 @@ class ExportController extends Controller }else { $value['payed_time'] = "------"; } + checkEncryptionAuth($value['user_account'],'spend_lists'); +// $value['user_account'] = encryption($value['user_account']); + $value['extend'] = $value['extend'].'`'; $value['pay_way'] = get_pay_way($value['pay_way']); $value['pay_status'] = get_info_status($value['pay_status'],9); @@ -1340,6 +1343,9 @@ class ExportController extends Controller ->order('id DESC') ->select(); foreach ($xlsData as $key => $value) { + + checkEncryptionAuth($xlsData[$key]['user_account'],'deposit_lists'); + $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); if ($value['pay_status'] == 1){ $xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']); @@ -1398,6 +1404,11 @@ class ExportController extends Controller ->where($map) ->order('id DESC') ->select(); + foreach ($xlsData as $key => $value) { + checkEncryptionAuth($xlsData[$key]['user_account'],'provide_list'); + } + + $xlsCell = array( array('pay_order_number', "订单号"), array('user_account', "玩家账号"), @@ -2253,9 +2264,9 @@ class ExportController extends Controller if(!empty(I('get.extend'))) { $map['tab_spend.extend'] = I('get.extend'); - $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select(); + $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->order('tab_repair_pay.id DESC')->select(); } else { - $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select(); + $data = M('repair_pay', 'tab_')->where($map)->order('id DESC')->select(); } $xlsData = []; @@ -2466,6 +2477,9 @@ class ExportController extends Controller $order_list['pay_amount'] = $v['pay_amount']; $order_list['pay_way'] = get_pay_way($v['pay_way']); $order_list['add_time'] = date('Y-m-d H:i:s', $v['add_time']); + + checkEncryptionAuth($order_list['user_account'],'TestOrder_lists'); + $xlsData[] = $order_list; } $sumData = [['server_type'=>'总计', @@ -2636,6 +2650,7 @@ class ExportController extends Controller $allDatas['spend_amount'] = $spend; $allDatas['deposit_amount'] = $deposit; $allDatas['coin_amount'] = $promoteCoin; + checkEncryptionAuth($allDatas['user_account'],'valueDetail'); mb_convert_variables('GBK', 'UTF-8', $allDatas); fputcsv($fp, $allDatas); } @@ -4142,6 +4157,7 @@ class ExportController extends Controller $xlsName = $_REQUEST['xlsname']; $data = $data['data']; foreach ($data as $key => $value) { + checkEncryptionAuth($data[$key]['user_account'],'BindRechargeRecordExport'); $data[$key]['pay_way'] = get_pay_way($value['pay_way']); $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']); if ($value['pay_status'] == 1) { @@ -8043,6 +8059,7 @@ class ExportController extends Controller array('balance_coin_count','平台币直充支出'), array('inside_cash_count','内充支出'), array('all_cash_count','游戏内充值合计'), + array('notice_fail_count','通知失败合计'), ); $map = []; @@ -8088,13 +8105,15 @@ class ExportController extends Controller $sumCash = $totalData['cash_count']; $sumBalance = $totalData['balance_coin_count']; $sumInside = $totalData['inside_cash_count']; + $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0; $sumAll = $sumCash + $sumBalance + $sumInside; $sumData = [['game_name'=>'总计', 'cash_count'=>$sumCash, 'balance_coin_count'=>$sumBalance, 'inside_cash_count'=>$sumInside, - 'all_cash_count'=>$sumAll]]; + 'all_cash_count'=>$sumAll, + 'notice_fail_count'=>$sumNoticeFail]]; $xlsData = array_merge($xlsData,$sumData); $this->exportAddOperationLog("Finance/gameStatistics","充值-财务管理-游戏统计-导出"); $this->exportExcel($xlsName, $xlsCell, $xlsData); diff --git a/Application/Admin/Controller/FinanceCompareController.class.php b/Application/Admin/Controller/FinanceCompareController.class.php index 749c43112..af19d85c9 100644 --- a/Application/Admin/Controller/FinanceCompareController.class.php +++ b/Application/Admin/Controller/FinanceCompareController.class.php @@ -70,6 +70,9 @@ class FinanceCompareController extends ThinkController "create_time"=>"校验时间" )); } + + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} $this->assign('list_data',$listdata); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 1ce945076..26a51e2db 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -749,12 +749,15 @@ class FinanceController extends ThinkController $this->assign('_page', $page);//分页 } + $this->checkListOrCountAuthRestMap($map,[]); + //统计合计 $totalData = D("spend")->totalGameStatistics($map); $sumCash = $totalData['cash_count']; $sumBalance = $totalData['balance_coin_count']; $sumInside = $totalData['inside_cash_count']; + $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0; $sumAll = $sumCash + $sumBalance + $sumInside; $game_types = M("game_type", 'tab_')->field('id, type_name')->select(); @@ -762,6 +765,7 @@ class FinanceController extends ThinkController $this->assign('sumCash', $sumCash); $this->assign('sumBalance', $sumBalance); $this->assign('sumInside', $sumInside); + $this->assign('sumNoticeFail', $sumNoticeFail); $this->assign('sumAll', $sumAll); $this->assign('data',$data); @@ -850,6 +854,11 @@ class FinanceController extends ThinkController $data[$key]['pay_way'] = getPayType($value['pay_way']); $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + + if (isset($_REQUEST['export'])) { + checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail'); + } + } if(isset($_REQUEST['export'])){ //操作日志 @@ -873,7 +882,13 @@ class FinanceController extends ThinkController data2csv($data,"游戏统计订单查看",$dcop); } - $totalData = D('spend')->totalGameStatistics($map, false); + $totalMap = $map; + if ($map['game_id']) { + $totalMap['s.game_id'] = $map['game_id']; + unset($totalMap['game_id']); + } + + $totalData = D('spend')->totalGameStatistics($totalMap, false); $sumCash = $totalData['cash_count'] ?? 0; $sumBalance = $totalData['balance_coin_count'] ?? 0; @@ -886,6 +901,7 @@ class FinanceController extends ThinkController $this->assign('sumAll', null_to_0($sumAll)); $count = D("spend")->getSpendData($map,'count(*) as count',$group,$order); + $this->checkListOrCountAuthRestMap($map,[]); $count = $count[0]['count']; $page = set_pagination($count,$row); @@ -1020,6 +1036,7 @@ class FinanceController extends ThinkController $count = count($count); $page = set_pagination($count,$row); + $this->checkListOrCountAuthRestMap($map,[]); $total_cost = D('spend')->sumSpend($map, 'cost');//订单金额合计 $total_pay_amount = D('spend')->sumSpend($map, 'pay_amount');//实付金额合计 @@ -1226,6 +1243,8 @@ class FinanceController extends ThinkController ,['支付方式','现金充值','平台币充值','合计']); } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('all_pay_amount', $all_pay_amount); $this->assign('all_balance', $all_balance); $this->assign('all_total', $all_total); @@ -1453,6 +1472,9 @@ class FinanceController extends ThinkController // } // } + + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} if(empty($_REQUEST['timestart']) && empty($_REQUEST['timeend']) && empty(I('user_account'))) { @@ -1534,6 +1556,9 @@ class FinanceController extends ThinkController }else { $fuhao = ''; } + + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($counts,$row); if($page) {$this->assign('_page', $page);} $this->assign('fuhao', $fuhao); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 73a4f30c2..24fbd3190 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -172,6 +172,7 @@ class FinancePromoteController extends AdminController $count['inside_cash_count'] = number_format($count['inside_cash_count'],2,'.',''); $count['all_count'] = number_format($count['all_count'],2,'.',''); + $this->checkListOrCountAuthRestMap($map,[]); //外团占比 $this->assign('outBelong',number_format($outBelong/$count['all_count']*100,2,'.','')); @@ -361,6 +362,9 @@ class FinancePromoteController extends AdminController "allcount"=>"渠道游戏内充值合计" )); } + + $this->checkListOrCountAuthRestMap($map,[]); + $size = $row; $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->assign('all_count', $allcount); @@ -485,6 +489,8 @@ class FinancePromoteController extends AdminController )); } + $this->checkListOrCountAuthRestMap($map,[]); + $allData = self::gameStatisticsData($map);//列表总数 $count = count($allData); $page = set_pagination($count, $row); @@ -583,6 +589,11 @@ class FinancePromoteController extends AdminController $data[$key]['pay_way'] = getPayType($value['pay_way']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + + if (isset($_REQUEST['export'])) { + checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail'); + } + } if (isset($_REQUEST['export'])) { @@ -611,6 +622,8 @@ class FinancePromoteController extends AdminController $sumInside = $totalData['inside_cash_count'] ?? 0; $sumAll = $sumCash + $sumBalance + $sumInside; + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('sumCash', $sumCash); $this->assign('sumBalance', $sumBalance); $this->assign('sumInside', $sumInside); @@ -752,6 +765,9 @@ class FinancePromoteController extends AdminController $data[$key]['cost'] = number_format($value['cost'],2,'.',''); $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); + if (isset($_REQUEST['export'])) { + checkEncryptionAuth($data[$key]['user_account'],'gameCoinDetail'); + } } if (isset($_REQUEST['export'])) { @@ -783,6 +799,9 @@ class FinancePromoteController extends AdminController data2csv($data,$title,$field); } + + $this->checkListOrCountAuthRestMap($map,[]); + $count = D("spend")->getSpendData($map,$field,$group,$order); $count = count($count); $page = set_pagination($count,$row); @@ -936,6 +955,7 @@ class FinancePromoteController extends AdminController data2csv($senddata,"平台币内充明细",$field); } + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('total_cost', $total_cost); $page = set_pagination($count,$row); diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index c375fe88d..ccca79c31 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -71,6 +71,8 @@ class GameController extends ThinkController $this->assign('show_status', 1); } + $this->checkListOrCountAuthRestMap($map,[]); + $extend['order'] = 'sort desc, id desc'; //$extend['for_show_pic_list']='icon';//列表显示图片 $this->m_title = '游戏列表'; diff --git a/Application/Admin/Controller/GameSourceController.class.php b/Application/Admin/Controller/GameSourceController.class.php index c9ac3ce2c..2dd15cd39 100644 --- a/Application/Admin/Controller/GameSourceController.class.php +++ b/Application/Admin/Controller/GameSourceController.class.php @@ -33,6 +33,9 @@ class GameSourceController extends ThinkController $extend['develop_id'] = array('NEQ', 0); break; } + + $this->checkListOrCountAuthRestMap($map,[]); + $this -> m_title = '原包管理'; $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'GameSource/lists', 'status' => 1]) -> find()); parent ::lists(self::model_name, $_GET["p"], $extend); diff --git a/Application/Admin/Controller/GameTypeController.class.php b/Application/Admin/Controller/GameTypeController.class.php index d74810097..77a3b4362 100644 --- a/Application/Admin/Controller/GameTypeController.class.php +++ b/Application/Admin/Controller/GameTypeController.class.php @@ -10,6 +10,9 @@ class GameTypeController extends ThinkController { const model_name = 'GameType'; public function lists($p=1){ + + $this->checkListOrCountAuthRestMap($map,[]); + switch ($_GET['type']) { case '': case 1: diff --git a/Application/Admin/Controller/GiftbagController.class.php b/Application/Admin/Controller/GiftbagController.class.php index 1d0625061..c3e08ba35 100644 --- a/Application/Admin/Controller/GiftbagController.class.php +++ b/Application/Admin/Controller/GiftbagController.class.php @@ -63,7 +63,9 @@ class GiftbagController extends ThinkController { $this->assign('show_status',1); } $extend['for_show_pic_list']='novice'; - + + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '礼包列表'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Giftbag/lists','status'=>1])->find()); @@ -92,7 +94,9 @@ class GiftbagController extends ThinkController { unset($_REQUEST['sdk_version']); } } - + + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '礼包领取记录'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Giftbag/record','status'=>1])->find()); diff --git a/Application/Admin/Controller/LaunchController.class.php b/Application/Admin/Controller/LaunchController.class.php index aea28a43f..1286bd9e1 100644 --- a/Application/Admin/Controller/LaunchController.class.php +++ b/Application/Admin/Controller/LaunchController.class.php @@ -32,6 +32,8 @@ class LaunchController extends ThinkController { $this->m_url = 'Launch/platform'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Merchandise/lists','status'=>1])->find()); + $this->checkListOrCountAuthRestMap($map,[]); + $data = D(self::model_name)->lists($_GET['p'],$extend); $this->assign('list_data',$data['data']); @@ -173,6 +175,8 @@ class LaunchController extends ThinkController { } + $this->checkListOrCountAuthRestMap($map,[]); + $this->meta_title = "投放数据列表"; $this->m_title = '投放数据'; diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index ff2267387..73a47deae 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1119,6 +1119,7 @@ class MemberController extends ThinkController if ($page) { $this->assign('_page', $page); } + $this->meta_title = '黑名单列表'; $this->display(); } diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index ef8edb37a..9ba943f92 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -11,6 +11,9 @@ use Base\Service\PromoteService as PromoteService; class MendController extends ThinkController { public $tempid = 0; public function lists($p=1){ + + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '推广补链'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Mend/lists','status'=>1])->find()); $this->mendList(); @@ -90,7 +93,9 @@ class MendController extends ThinkController { )); die(); } - + + $this->checkListOrCountAuthRestMap($map,[]); + $count = M("Mend","tab_")->where($map)->count(); $this->assign('row_count',$count); $this->assign('list_data', $data); diff --git a/Application/Admin/Controller/MerchandiseController.class.php b/Application/Admin/Controller/MerchandiseController.class.php index 0204fcfab..f957d2921 100644 --- a/Application/Admin/Controller/MerchandiseController.class.php +++ b/Application/Admin/Controller/MerchandiseController.class.php @@ -32,7 +32,8 @@ class MerchandiseController extends ThinkController { $this->m_title = '商品列表'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Merchandise/lists','status'=>1])->find()); - + $this->checkListOrCountAuthRestMap($map,[]); + parent::lists(self::model_name,$_GET['p'],$extend); } diff --git a/Application/Admin/Controller/MsgController.class.php b/Application/Admin/Controller/MsgController.class.php index 683bcaef4..f30c99092 100644 --- a/Application/Admin/Controller/MsgController.class.php +++ b/Application/Admin/Controller/MsgController.class.php @@ -28,7 +28,8 @@ class MsgController extends ThinkController{ $this->m_title = '站内通知'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Msg/lists','status'=>1])->find()); - + + $this->checkListOrCountAuthRestMap($map,[]); $this->display(); } diff --git a/Application/Admin/Controller/OrderController.class.php b/Application/Admin/Controller/OrderController.class.php index 358fb7492..d386a7ef8 100644 --- a/Application/Admin/Controller/OrderController.class.php +++ b/Application/Admin/Controller/OrderController.class.php @@ -49,6 +49,9 @@ class OrderController extends ThinkController if (!empty($_REQUEST['keyword'])) { $extend['game_name|title|server_name|small_account'] = array('like', '%' . $_REQUEST['keyword'] . '%'); } + + $this->checkListOrCountAuthRestMap($map,[]); + $extend['admin_status'] = 0; $this -> m_title = '订单列表'; $this -> meta_title = '订单列表'; diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 6a7c4a2e7..b01fb2cf7 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -187,6 +187,7 @@ class PartnerController extends ThinkController if ($page) { $this->assign('_page', $page); } + $this->checkListOrCountAuthRestMap($map,[]); // dd($parseData[0]); $this->assign('listData', $parseData[0]); $this->assign('count', $count); diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 2f5a46870..f6393070d 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -358,6 +358,7 @@ class PayChannelController extends ThinkController "game_name"=>"产品名称","sdk_version"=>"设备名称","pay_amount"=>"游戏现金金额","platform_coin"=>"平台币直冲金额","test_coin"=>"测试金额","sum"=>"支付渠道内合计")); } + $this->checkListOrCountAuthRestMap($map,[]); $sumData['pay_amount'] = number_format($sumData['pay_amount'],2,'.',''); $sumData['platform_coin'] = number_format($sumData['platform_coin'],2,'.',''); @@ -720,6 +721,9 @@ class PayChannelController extends ThinkController $this->meta_title = "游戏订单查看"; $sumAllData['sum'] = number_format($sumAllData['bind_amount']+$sumAllData['platform_amount']+$sumAllData['pay_amount'],2,'.',''); // var_dump($sumAllData);die(); + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('sumAllData',$sumAllData); $this->assign('data',$data); $this->display(); @@ -883,6 +887,10 @@ class PayChannelController extends ThinkController $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']); $v['pay_way'] = get_pay_way($v['pay_way']); + if ($v['user_account']) { + checkEncryptionAuth($v['user_account'],'gameDetail'); + } + $xlsData[] = $v; mb_convert_variables('GBK', 'UTF-8', $v); @@ -1289,6 +1297,8 @@ class PayChannelController extends ThinkController } } + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); @@ -1430,6 +1440,8 @@ class PayChannelController extends ThinkController foreach ($data as $key => $value) { + checkEncryptionAuth($value['user_account'],'testDetail'); + $value['pay_order_number'] = "'".$value['pay_order_number']; $value['order_number'] = "'".$value['order_number']; $value['game_name'] =clearGameNameType($value['game_name']); diff --git a/Application/Admin/Controller/PayChannelIntentionController.class.php b/Application/Admin/Controller/PayChannelIntentionController.class.php index 482d57b8a..83220cb53 100644 --- a/Application/Admin/Controller/PayChannelIntentionController.class.php +++ b/Application/Admin/Controller/PayChannelIntentionController.class.php @@ -165,6 +165,8 @@ class PayChannelIntentionController extends AdminController } } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data',$data); $this->display(); @@ -492,6 +494,8 @@ class PayChannelIntentionController extends AdminController } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data',$data); $this->assign('sum',$sum); diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 6a53681e6..07ec21bf5 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -101,6 +101,9 @@ class PlatformController extends ThinkController $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) $data = array_slice($data, ($arraypage - 1) * $size, $size); + + $this->checkListOrCountAuthRestMap($map,[]); + $this->meta_title = '游戏注册统计列表'; $this->assign('list_data', $data); $this->assign("is_admin",is_administrator()); @@ -192,6 +195,8 @@ class PlatformController extends ThinkController $this->assign('_page', $page); } + $this->checkListOrCountAuthRestMap($map,[]); + $data = my_sort($data, $data_order_type, (int)$data_order); $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 @@ -292,6 +297,9 @@ class PlatformController extends ThinkController $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) $data = array_slice($data, ($arraypage - 1) * $size, $size); + + $this->checkListOrCountAuthRestMap($map,[]); + $this->meta_title = '注册方式统计列表'; $this->assign('list_data', $data); $this->assign('total', $total); @@ -386,6 +394,8 @@ class PlatformController extends ThinkController $this->assign('_page', $page); } + $this->checkListOrCountAuthRestMap($map,[]); + $data = my_sort($data, $data_order_type, (int)$data_order); $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 @@ -578,6 +588,8 @@ class PlatformController extends ThinkController $this->assign('_page', $page); } + $this->checkListOrCountAuthRestMap($map,[]); + $data = my_sort($data, $data_order_type, (int)$data_order); $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 @@ -783,6 +795,9 @@ class PlatformController extends ThinkController "mounth"=>"本月充值", )); } + + $this->checkListOrCountAuthRestMap($map,[]); + $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->meta_title = '渠道充值统计列表'; $this->assign('list_data', $data); diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php index 1ed56c59a..ebb57a254 100644 --- a/Application/Admin/Controller/PresidentDepositController.class.php +++ b/Application/Admin/Controller/PresidentDepositController.class.php @@ -147,6 +147,8 @@ class PresidentDepositController extends ThinkController } } + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count, $row); if($page) { $this->assign('_page', $page); diff --git a/Application/Admin/Controller/PromoteCoinController.class.php b/Application/Admin/Controller/PromoteCoinController.class.php index 270785964..ab7d18b05 100644 --- a/Application/Admin/Controller/PromoteCoinController.class.php +++ b/Application/Admin/Controller/PromoteCoinController.class.php @@ -50,6 +50,7 @@ class PromoteCoinController extends ThinkController $sum['all_num'] = D(self::model_name)->where($extend)->sum('num'); // echo D(self::model_name)->getLastSql();exit; + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('sum', $sum); $this->m_title = '平台币发放(推广员)'; @@ -91,7 +92,7 @@ class PromoteCoinController extends ThinkController // $map['id'] = array('lt',1); // } setPowerPromoteIds($map,'promote_id'); - + $this->checkListOrCountAuthRestMap($map,[]); $map['create_time'] = total(1, false); $sum['to_day'] = D(self::model_name)->where($map)->sum('num'); @@ -294,6 +295,8 @@ class PromoteCoinController extends ThinkController $count = $pc->where($extend)->count(); + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 779518460..d4825c0dd 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -2,6 +2,7 @@ namespace Admin\Controller; +use mysql_xdevapi\Exception; use User\Api\UserApi as UserApi; use OSS\OssClient; use OSS\Core\OSsException; @@ -472,4 +473,80 @@ class PromoteCompanyController extends ThinkController } # code... } + + public function promoteDataConfigIndex() { + + if (IS_POST) { + + $changeData = I('post.',''); + + $promoteData = M("promote","tab_") + ->field("id") + ->where(['company_belong'=>2]) + ->select(); + + $promoteData = implode(',',array_column($promoteData,'id')); + + if ($changeData['admin_type'] == 1) { + + + $num_pend = 0; + $num_deposit = 0; + if ($promoteData) { + + $sql_spend = "UPDATE `tab_spend` SET `old_change_promote_id`=`promote_id`,`old_change_promote_account`=`promote_account`,`promote_id`=0,`promote_account`='无' WHERE promote_id in({$promoteData})"; + $sql_deposit = "UPDATE `tab_deposit` SET `old_change_promote_id`=`promote_id`,`old_change_promote_account`=`promote_account`,`promote_id`=0,`promote_account`='无' WHERE promote_id in({$promoteData})"; + + $model = new \Think\Model(); + $num_pend = $model->execute($sql_spend,true); + $num_deposit = $model->execute($sql_deposit,true); + + $this->ajaxReturn(['info'=>"处理订单数据".($num_pend+$num_deposit).'条']); + + } + + } else if ($changeData['admin_type'] == 2){ + $num_pend = 0; + $num_deposit = 0; + + if ($promoteData) { + + $sql_spend = "UPDATE `tab_spend` SET `promote_id`=`old_change_promote_id`,`promote_account`=`old_change_promote_account`,`old_change_promote_id`=0,`old_change_promote_account`='' +WHERE old_change_promote_id in ({$promoteData})"; + $sql_deposit = "UPDATE `tab_deposit` SET `promote_id`=`old_change_promote_id`,`promote_account`=`old_change_promote_account`,`old_change_promote_id`=0,`old_change_promote_account`='' +WHERE old_change_promote_id in ({$promoteData})"; + + $model = new \Think\Model(); + $num_pend = $model->execute($sql_spend,true); + $num_deposit = $model->execute($sql_deposit,true); + + $this->ajaxReturn(['info'=>"将数据还原,处理订单数据".($num_pend+$num_deposit).'条']); + + } + + } + + } else { + + $promoteData = M("promote","tab_") + ->field("id") + ->where(['company_belong'=>2]) + ->select(); + + $promoteData = implode(',',array_column($promoteData,'id')); + + $spendData = M('spend','tab_')->field("old_change_promote_account")->where(['old_change_promote_id'=>['in',$promoteData]])->find(); + +// var_dump($spendData);die(); + + if ($spendData['old_change_promote_account']) { + $this->assign('old_change_promote_account',1); + } + + $this->display('promotedataconfigindex'); + + } + + } + } diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 946364192..7afd08c6d 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -18,6 +18,9 @@ class PromoteController extends ThinkController public function lists($p=1) { + + $this->checkListOrCountAuthRestMap($map,[]); + $show_data_power = (is_administrator()|| session('user_auth')['show_data']); $this->assign('show_data_power', $show_data_power); switch ($_GET['type']) { @@ -738,6 +741,8 @@ class PromoteController extends ThinkController $this->assign('ytotal', $ytotal); $user = A('User', 'Event'); + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '实时注册'; $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/ch_reg_list','status'=>1])->find()); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); @@ -883,6 +888,8 @@ class PromoteController extends ThinkController $this->assign('ytotal', $ytotal); $user = A('Spend', 'Event'); + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '实时充值'; $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/spend_list','status'=>1])->find()); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); @@ -960,6 +967,8 @@ class PromoteController extends ThinkController $this->assign('ttotal', $ttotal); $this->assign('ytotal', $ytotal); + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '会长代充记录'; $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/agent_list','status'=>1])->find()); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); @@ -1286,7 +1295,7 @@ class PromoteController extends ThinkController public function linkInfo() { $link = $_REQUEST['link']; - + $applyServe = new ApplyService(); $identifier = $applyServe->getPageIdentifier($link); if (!$identifier) { diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php index 949ad092f..a91c37f10 100644 --- a/Application/Admin/Controller/PromoteGameRatioController.class.php +++ b/Application/Admin/Controller/PromoteGameRatioController.class.php @@ -219,6 +219,9 @@ class PromoteGameRatioController extends ThinkController if($page) { $this->assign('_page', $page); } + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('companys', $companys); $this->assign('gameTypeList', $gameTypelist); $this->assign('group', $group); diff --git a/Application/Admin/Controller/PromoteWelfareController.class.php b/Application/Admin/Controller/PromoteWelfareController.class.php index 49d7a0767..e13dadb25 100644 --- a/Application/Admin/Controller/PromoteWelfareController.class.php +++ b/Application/Admin/Controller/PromoteWelfareController.class.php @@ -43,6 +43,7 @@ class PromoteWelfareController extends ThinkController { break; } + $this->checkListOrCountAuthRestMap($map,[]); $this->assign("show_status",$show_status); $this->m_title = '折扣设置'; diff --git a/Application/Admin/Controller/ProvideController.class.php b/Application/Admin/Controller/ProvideController.class.php index 4f8aa88fc..6d342260e 100644 --- a/Application/Admin/Controller/ProvideController.class.php +++ b/Application/Admin/Controller/ProvideController.class.php @@ -62,6 +62,7 @@ class ProvideController extends ThinkController { $ttotal=null_to_0(D(self::model_name)->where('create_time'.total(1))->where(array('status'=>1))->sum('amount')); $ytotal=null_to_0(D(self::model_name)->where('create_time'.total(5))->where(array('status'=>1))->sum('amount')); // $this->assign('dtotal',$dtotal); + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('total',$total); $this->assign('ttotal',$ttotal); $this->assign('ytotal',$ytotal); diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 1e26a082b..8df9d88a6 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -57,6 +57,8 @@ class QueryController extends ThinkController $this->assign('show_data_power', $show_data_power); $promoteId = I('promote_id', 0); + $this->checkListOrCountAuthRestMap($map,[]); + if ($group == 1) { unset($settlementTypeList[WithdrawModel::SETTLEMENT_TYPE_OTHER]); $time = I('time', ''); @@ -568,6 +570,8 @@ class QueryController extends ThinkController $this->m_title = '开发者结算'; $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Query/cpsettlement', 'status' => 1])->find()); + $this->checkListOrCountAuthRestMap($map,[]); + if (isset($_REQUEST['timestart']) && $_REQUEST['timestart'] != '' && $_REQUEST['group'] == 1) { $starttime = strtotime($_REQUEST['timestart']); $endtime = strtotime($_REQUEST['timeend']) + 24 * 3600 - 1; @@ -1015,6 +1019,9 @@ class QueryController extends ThinkController $ttotal = null_to_0(D('withdraw')->where('audit_time' . total(1))->where($map1)->sum('sum_money')); $ytotal = null_to_0(D('withdraw')->where('audit_time' . total(5))->where($map1)->sum('sum_money')); } + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('stotal', $total); $this->assign('ttotal', $ttotal); $this->assign('ytotal', $ytotal); @@ -1161,6 +1168,8 @@ class QueryController extends ThinkController } } + $this->checkListOrCountAuthRestMap($map,[]); + $map1 = array('status' => ['neq', -1]); //为数据权限添加 setPowerPromoteIds($map1); diff --git a/Application/Admin/Controller/RebateController.class.php b/Application/Admin/Controller/RebateController.class.php index b24353875..d7314cd22 100644 --- a/Application/Admin/Controller/RebateController.class.php +++ b/Application/Admin/Controller/RebateController.class.php @@ -13,7 +13,7 @@ class RebateController extends ThinkController { *返利设置列表 */ public function lists(){ - + $this->checkListOrCountAuthRestMap($map,[]); switch ($_REQUEST['type']) { case '': case 1 : diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 848f4e11c..5a52d93ee 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -149,6 +149,9 @@ class RechargeSumController extends ThinkController $this->exportSum($export_data); } + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('meta_title', "充值汇总"); $this->assign('list_data', $data); $this->assign('total', $total); diff --git a/Application/Admin/Controller/SelfbuiltController.class.php b/Application/Admin/Controller/SelfbuiltController.class.php index 7194a736a..e0ea3e1e9 100644 --- a/Application/Admin/Controller/SelfbuiltController.class.php +++ b/Application/Admin/Controller/SelfbuiltController.class.php @@ -24,7 +24,8 @@ class SelfbuiltController extends ThinkController { $this->m_title = '自建官网'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Selfbuilt/index','status'=>1])->find()); - + + $this->checkListOrCountAuthRestMap($map,[]); parent::lists($this->model_name,$_GET["p"]); } diff --git a/Application/Admin/Controller/ServerController.class.php b/Application/Admin/Controller/ServerController.class.php index 15318d831..86fc893b6 100644 --- a/Application/Admin/Controller/ServerController.class.php +++ b/Application/Admin/Controller/ServerController.class.php @@ -54,7 +54,9 @@ class ServerController extends ThinkController { $extend['developers'] = array('NEQ',0); $this->assign('show_status',1); } - + + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '区服列表'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find()); diff --git a/Application/Admin/Controller/ServerNoticeController.class.php b/Application/Admin/Controller/ServerNoticeController.class.php index 530bbd28a..c007cd322 100644 --- a/Application/Admin/Controller/ServerNoticeController.class.php +++ b/Application/Admin/Controller/ServerNoticeController.class.php @@ -49,7 +49,9 @@ class ServerNoticeController extends ThinkController { $extend['developers'] = array('NEQ',0); $this->assign('show_status',1); } - + + $this->checkListOrCountAuthRestMap($map,[]); + $this->m_title = '区服预告'; $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'ServerNotice/lists','status'=>1])->find()); diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index 12b37a10a..d11d33087 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -49,6 +49,8 @@ class StatController extends ThinkController $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} + $this->checkListOrCountAuthRestMap($map,[]); + $this->meta_title = '用户统计'; $this->assign('data',$data); @@ -216,6 +218,8 @@ class StatController extends ThinkController $this->assign('error', $error); } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data', $data); $this->assign('order_type', $orderType); $this->assign('order_column', $orderColumn); @@ -813,6 +817,9 @@ AND UNIX_TIMESTAMP( $this->assign('userarpu_order',$data_order); $this->assign('userarpu_order_type',$data_order_type); } + + $this->checkListOrCountAuthRestMap($map,[]); + $data=my_sort($data,$data_order_type,(int)$data_order,SORT_STRING); $size=$row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 @@ -1519,6 +1526,8 @@ AND UNIX_TIMESTAMP( // 折线图 $this->foldLineDiagram($_REQUEST['start'],$_REQUEST['end'],$_REQUEST['num']); + $this->checkListOrCountAuthRestMap($map,[]); + $this->display(); } diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 1e66e5276..0e741a1d6 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -76,6 +76,7 @@ class StatementMangementController extends ThinkController $handleSumData[0] = 0; } + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('sum',$handleSumData); // dump($sumData);die(); diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index bda8b0c38..cb6cf5db7 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -73,8 +73,8 @@ class StatisticsController extends ThinkController { $this->assign('promotepay',$promote_data['pay']); $this->assign('promote_chart', $promote_data['chart']); $this->assign('promote_date_info',"统计[ ".date("Y/m/d",$promotedateinfo[2])." -- ".date("Y/m/d",$promoteyesterdaydate)." ]之间数据"); - + $this->checkListOrCountAuthRestMap($map,[]); // 日历 R('Index/calendar'); @@ -1128,6 +1128,9 @@ class StatisticsController extends ThinkController { ]; } } + + $this->checkListOrCountAuthRestMap($map,[]); + $count = ($end-$start)/86400; $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index ecab06174..816f40ec0 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -36,6 +36,9 @@ class SuperStatisticalController extends ThinkController foreach($supersign_token as $k => $v) { $authorization_all_num += count($this->game_supersign_num($v)); } + + $this->checkListOrCountAuthRestMap($map,[]); + $where['pay_status'] = 1; $data['buy_num'] = M('game_supersign', 'tab_')->where($where)->count(); $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($where)->select(); diff --git a/Application/Admin/Controller/SupportController.class.php b/Application/Admin/Controller/SupportController.class.php index 7cb6cb7ff..d72fcb9ac 100644 --- a/Application/Admin/Controller/SupportController.class.php +++ b/Application/Admin/Controller/SupportController.class.php @@ -40,6 +40,8 @@ class SupportController extends ThinkController { //分页 $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} + + $this->checkListOrCountAuthRestMap($map,[]); $this->assign('list_data', $list); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php index 8f40fca77..0141a6507 100644 --- a/Application/Admin/Controller/TestOrderController.class.php +++ b/Application/Admin/Controller/TestOrderController.class.php @@ -64,6 +64,8 @@ class TestOrderController extends ThinkController $this->assign('_page', $page);//分页 } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('datas', $order_list); $this->assign('sum_order_amount', $sum_order_amount); $this->assign('sum_pay_amount', $sum_pay_amount); diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php index d20dc70ac..f9d1fde7a 100644 --- a/Application/Admin/Controller/TestResourceController.class.php +++ b/Application/Admin/Controller/TestResourceController.class.php @@ -46,6 +46,9 @@ class TestResourceController extends ThinkController if ($page) { $this->assign('_page', $page); } + + $this->checkListOrCountAuthRestMap($map,[]); + $show_data_power = (is_administrator()|| session('user_auth')['show_data']); $this->assign('show_data_power', $show_data_power); $this->assign('list_data', $list); @@ -101,7 +104,7 @@ class TestResourceController extends ThinkController $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} - $this->meta_title = '扶持号管理'; + $this->meta_title = '资源管理'; $this->assign('data',$data); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); $this->assign('show_data_power', $show_data_power); @@ -109,6 +112,69 @@ class TestResourceController extends ThinkController } + public function batchFreeze() { + + if (I('id','')) { + $id =I('id',''); + } else { + $this->error('请选择资源后再进行操作'); + $this->ajaxReturn(['status'=>0, 'msg'=> '请选择资源后再进行操作']); + } + + if (!I('status','')&&I('status','')!='0') { + $this->ajaxReturn(['status'=>0, 'msg'=> '请选择状态后在进行操作']); +// $this->error('请选择状态后在进行操作'); + } + +// $resourceData = M('test_resource','tab_') +// ->field("promote_id") +// ->where(['id'=>['in',$id]]) +// ->select(); +// +// $resourceData = array_column($resourceData,'promote_id'); + +// $promoteId = []; +// +// foreach ($resourceData as $key => $value) { +// +// $promoteData = M('promote','tab_') +// ->field('id') +// ->where("chain like '%/{$value}/%' or id = {$value}") +// ->select(); +// $promoteId = array_merge($promoteData, $promoteId); +// } + +// $promoteId = array_unique($resourceData); +// var_dump($promoteId);die(); + + $testResource = M('test_resource','tab_') + ->field("user_id") + ->where(['id'=>['in',$id]]) + ->group('user_id') + ->select(); + + $data = [ + 'lock_status' => I('status','') + ]; + + $user_id = implode(',',array_column($testResource,'user_id')); + + $isFreeze = M('user','tab_')->where(['id'=>['in',$user_id]])->save($data); + + if ($isFreeze) { + +// $this->success('操作成功',U('supportNumberList')); + $this->ajaxReturn(['status'=>1, 'msg'=> '操作成功']); + + } else { + + $this->ajaxReturn(['status'=>0, 'msg'=> '操作失败']); +// $this->error('操作失败',U('supportNumberList')); + + } + + } + public function freezeSupport() { $supportId = I('support_id', 0); if ($supportId == 0) { @@ -339,6 +405,9 @@ class TestResourceController extends ThinkController $map['create_time'] = array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1)); unset($_REQUEST['start']);unset($_REQUEST['end']); } + if(!empty($_REQUEST['promote_id'])||$_REQUEST['promote_id']=='0') { + $map['tab_test_resource.promote_id']=I('promote_id'); + } // $res = D("test_resource")->getResourceCout($map,$page,$row); // dump($res); diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index a1aae43d4..9a800890b 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -325,4 +325,22 @@ class TimingController extends AdminController { } + public function getTogetherUserAccount() { + + if (I('user_id','')) { + $user_id = I('user_id',''); + } else { + return false; + } + + $data = M('user','tab_')->field('account')->where(['id'=>$user_id])->find(); +// var_dump($data); + if (!$data) { + return false; + } + + $this->ajaxReturn($data); + + } + } diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php index 62b6db757..4d2933542 100644 --- a/Application/Admin/Controller/UserActionLogController.class.php +++ b/Application/Admin/Controller/UserActionLogController.class.php @@ -59,25 +59,45 @@ class UserActionLogController extends AdminController foreach($data as $key=>$value) { $remarks = json_decode($value['remarks'],true); -// dump($data); + + $action = json_decode($value['action'],true); if ($value['type'] == 3) { - $data[$key]['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + $data[$key]['action_title'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); } else if ($value['type'] == 4) { - $data[$key]['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + $data[$key]['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); } else if ($value['type'] == 0) { - $data[$key]['action'] = '修改密码'; + $data[$key]['action_title'] = '修改密码'; + if (!$action['old_data']) { + $data[$key]['action_content'] = "-------------------"; + } else { + $data[$key]['action_content'] = "旧值：{$action['old_data']}
新值：{$action['new_data']}"; + } + } else if ($value['type'] == 1) { - $data[$key]['action'] = '修改/绑定手机号'; + $data[$key]['action_title'] = '修改/绑定手机号'; + $data[$key]['action_content'] = "手机号：{$action['phone']}"; } else if ($value['type'] == 2) { - $data[$key]['action'] = '修改身份信息'; + $data[$key]['action_title'] = '修改身份信息'; + $data[$key]['action_content'] = $action['old_data']?"旧姓名：{$action['old_data']['real_name']} - 新姓名：{$action['new_data']['real_name']}
旧身份证：{$action['old_data']['idcard']} - 新身份证：{$action['new_data']['idcard']}":"无历史记录"; } else if ($value['type'] == 5) { - $data[$key]['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); - } else if ($value['type'] == 11) { - $data[$key]['action'] = '修改绑定上级推广员'; + $data[$key]['action_title'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + } else if ($value['type'] == 6) { + $data[$key]['action_title'] = '点击推广链接下载'; + $data[$key]['action_content'] = "下载地址：".$value['action'];; + } else if ($value['type'] == 7){ + $data[$key]['action_title'] = '修改角色名'; + $data[$key]['action_content'] = "旧值：{$action['old_data']}
新值：{$action['new_data']}"; + } else if ($value['type'] == 8){ + $data[$key]['action_title'] = '解绑手机号'; + $data[$key]['action_content'] = "手机号：{$action['phone']}"; + } + else if ($value['type'] == 11) { + $data[$key]['action_title'] = '修改绑定上级推广员'; } else { - $data[$key]['action'] = '未知'; + $data[$key]['action_title'] = '未知'; } + } // die(); @@ -88,6 +108,8 @@ class UserActionLogController extends AdminController $this->assign('_page', $page);//分页 } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data',$data); $this->display(); @@ -117,7 +139,7 @@ class UserActionLogController extends AdminController $xlsName = $_REQUEST['xlsname']; $xlsCell = array( - '编号','行为','游戏','玩家','操作时间','操作IP地址' + '编号','行为','内容','游戏','玩家','操作时间','操作IP地址' ); $map = []; @@ -165,7 +187,7 @@ class UserActionLogController extends AdminController /* 获取频道列表 */ $xlsData = M('user_action_log','tab_') - ->field("id,action,game_name,account,create_time,ip,type,remarks") + ->field("id,'' as action_title,'' as action_content,game_name,account,create_time,ip,type,remarks,action") ->where($map) ->limit(($i-1)*$perSize ,$perSize) ->order('create_time DESC')->select(); @@ -174,28 +196,70 @@ class UserActionLogController extends AdminController $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']); +// $remarks = json_decode($value['remarks'],true); +//// dump($data); +// +// if ($value['type'] == 3) { +// $value['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); +// } else if ($value['type'] == 4) { +// $value['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); +// } else if ($value['type'] == 0) { +// $value['action'] = '修改密码'; +// } else if ($value['type'] == 1) { +// $value['action'] = '修改/绑定手机号'; +// } else if ($value['type'] == 2) { +// $value['action'] = '修改身份信息'; +// } else if ($value['type'] == 5) { +// $value['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); +// } else if ($value['type'] == 11) { +// $value['action'] = '修改绑定上级推广员'; +// } else { +// $value['action'] = '未知'; +// } + $remarks = json_decode($value['remarks'],true); -// dump($data); + + $action = json_decode($value['action'],true); if ($value['type'] == 3) { - $value['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + $value['action_title'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); } else if ($value['type'] == 4) { - $value['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + $value['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); } else if ($value['type'] == 0) { - $value['action'] = '修改密码'; + $value['action_title'] = '修改密码'; + if ($action['account']) { + $value['action_content'] = "-------------------"; + } else { + $value['action_content'] = "旧值：{$action['old_data']}
新值：{$action['new_data']}"; + } + } else if ($value['type'] == 1) { - $value['action'] = '修改/绑定手机号'; + $value['action_title'] = '修改/绑定手机号'; + $value['action_content'] = "手机号：{$action['phone']}"; } else if ($value['type'] == 2) { - $value['action'] = '修改身份信息'; + $value['action_title'] = '修改身份信息'; + $value['action_content'] = $action['old_data']?"旧姓名：{$action['old_data']['real_name']} - 新姓名：{$action['new_data']['real_name']}
旧身份证：{$action['old_data']['idcard']} - 新身份证：{$action['new_data']['idcard']}":"无历史记录"; } else if ($value['type'] == 5) { - $value['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); - } else if ($value['type'] == 11) { - $value['action'] = '修改绑定上级推广员'; + $value['action_title'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无'); + } else if ($value['type'] == 6) { + $value['action_title'] = '点击推广链接下载'; + $value['action_content'] = "下载地址：".$value['action'];; + } else if ($value['type'] == 7){ + $value['action_title'] = '修改角色名'; + $value['action_content'] = "旧值：{$action['old_data']}
新值：{$action['new_data']}"; + } else if ($value['type'] == 8){ + $value['action_title'] = '解绑手机号'; + $value['action_content'] = "手机号：{$action['phone']}"; + } + else if ($value['type'] == 11) { + $value['action_title'] = '修改绑定上级推广员'; } else { - $value['action'] = '未知'; + $value['action_title'] = '未知'; } + unset($value['type']); unset($value['remarks']); + unset($value['action']); mb_convert_variables('GBK', 'UTF-8', $value); fputcsv($fp, $value); @@ -266,6 +330,8 @@ class UserActionLogController extends AdminController $this->assign('_page', $page);//分页 } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data',$data); $this->display(); diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index f91a9cdcc..64cc6a33e 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -39,6 +39,8 @@ class UserController extends AdminController $list = $this->lists('Member', $map); int_to_string($list); + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('_list', $list); $this->meta_title = '管理员列表'; @@ -507,6 +509,8 @@ class UserController extends AdminController $this->assign('_page', $page); } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('list', $list); $this->meta_title = '修改记录'; diff --git a/Application/Admin/Controller/UserPayWhiteListController.class.php b/Application/Admin/Controller/UserPayWhiteListController.class.php index 804db6448..4aa42ff23 100644 --- a/Application/Admin/Controller/UserPayWhiteListController.class.php +++ b/Application/Admin/Controller/UserPayWhiteListController.class.php @@ -57,6 +57,8 @@ class UserPayWhiteListController extends ThinkController if($page) {$this->assign('_page', $page);} } + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('data',$data); $this->meta_title = '玩家支付限制白名单'; diff --git a/Application/Admin/Controller/UserWithdrawController.class.php b/Application/Admin/Controller/UserWithdrawController.class.php index d39796635..261af2d44 100644 --- a/Application/Admin/Controller/UserWithdrawController.class.php +++ b/Application/Admin/Controller/UserWithdrawController.class.php @@ -44,6 +44,9 @@ class UserWithdrawController extends ThinkController { $ttotal = null_to_0($wgc->where('create_time' . total(1))->where($map)->sum('coin')); $mtotal = null_to_0($wgc->where('create_time' . total(3))->where($map)->sum('coin')); $poundage = null_to_0($wgc->where($map)->sum('poundage')); + + $this->checkListOrCountAuthRestMap($map,[]); + $this->assign('total', $total); $this->assign('ttotal', $ttotal); $this->assign('mtotal', $mtotal); diff --git a/Application/Admin/Controller/WorkOrderController.class.php b/Application/Admin/Controller/WorkOrderController.class.php index 2c13724ab..5f7a5d1c0 100644 --- a/Application/Admin/Controller/WorkOrderController.class.php +++ b/Application/Admin/Controller/WorkOrderController.class.php @@ -58,6 +58,9 @@ class WorkOrderController extends ThinkController $item['status_desc'] = $this->getOrderStatus($item['status']); } } + + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); @@ -427,6 +430,9 @@ class WorkOrderController extends ThinkController $order limit {$limit}"); } + + $this->checkListOrCountAuthRestMap($map,[]); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 08a649334..d338b8aaf 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -840,20 +840,33 @@ class SpendModel extends Model */ public function gameStatistics($map, $row = 0, $page = 1) { + + $noticeFailData = M("Spend s use index(game_time)","tab_") + ->field("SUM(pay_amount) as notice_fail_count,game_id") + ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') + ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') + ->where(['s.pay_status' => 1, 'pay_game_status' => 0]) + ->where($map) + ->group('s.game_id') + ->select(false); + $query = M("Spend s use index(game_time)","tab_") ->field("s.game_id,g.relation_game_name game_name,p.partner as partner_name, g.game_type_name, - SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, -SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, -SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version") + SUM(CASE WHEN pay_way > 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as cash_count, +SUM(CASE WHEN pay_way = 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as balance_coin_count, +SUM(CASE WHEN pay_way = -1 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version,notice_fail_count") ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') - ->where(['s.pay_status' => 1, 'pay_game_status' => 1]) + ->join("LEFT JOIN ({$noticeFailData})a ON s.game_id = a.game_id") + ->where(['s.pay_status' => 1]) +// ->where("(s.pay_status = 1 and pay_game_status = 1) or (s.pay_status = 1 and pay_game_status = 0)") ->where($map) ->group('s.game_id'); if ($row) { $query = $query->page($page,$row); } $data = $query->select(); +// var_dump($data);die(); return $data; } public function gameStatisticsCount($map) @@ -863,7 +876,7 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sd ->field("game_id") ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') - ->where(['s.pay_status' => 1, 'pay_game_status' => 1]) + ->where(['s.pay_status' => 1]) ->where($map) ->group('s.game_id'); $data = $query->select(); @@ -876,17 +889,39 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sd */ public function totalGameStatistics($map, $join = true) { + + + $noticeFailData = M("Spend s use index(game_time)","tab_") + ->field("SUM(pay_amount) as notice_fail_count,game_id") + ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') + ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') + ->where(['s.pay_status' => 1, 'pay_game_status' => 0]) + ->where($map) + ->find(); +// var_dump($noticeFailData);die(); + + $query = M("Spend s use index(game_time)","tab_") - ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, -SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, -SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count"); + ->field("SUM(CASE WHEN pay_way > 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as cash_count, +SUM(CASE WHEN pay_way = 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as balance_coin_count, +SUM(CASE WHEN pay_way = -1 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as inside_cash_count"); if ($join) { $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id') ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id'); } - $data = $query->where(['s.pay_status' => 1, 'pay_game_status' => 1]) + $data = $query->where(['s.pay_status' => 1]) ->where($map) ->find(); + +// $gc_game_id = array_unique(explode(',',$data['gc_game_id'])); + +// $noticeFailData = M("Spend s use index(game_time)","tab_") +// ->field("SUM(pay_amount) as notice_fail_count,game_id") +// ->where(['s.pay_status' => 1, 'pay_game_status' => 0]) +// ->where($noticeMap) +// ->find(); + + $data['notice_fail_count'] = $noticeFailData['notice_fail_count']; // dd($query->_sql()); return $data; } diff --git a/Application/Admin/Model/TestResourceModel.class.php b/Application/Admin/Model/TestResourceModel.class.php index 5b601848b..ffe13d375 100644 --- a/Application/Admin/Model/TestResourceModel.class.php +++ b/Application/Admin/Model/TestResourceModel.class.php @@ -33,9 +33,9 @@ class TestResourceModel extends Model{ $promote_id=session("promote_auth.pid"); //获取基本信息 $res = $this - ->table("tab_test_resource as test") - ->field("test.*,user.check_status") - ->join('tab_user user on test.user_id=user.id','left') + ->table("tab_test_resource") + ->field("tab_test_resource.*,user.check_status") + ->join('tab_user user on tab_test_resource.user_id=user.id','left') ->page($page,$row) ->order("create_time desc") ->where($map) diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php index 79ee7bab4..6804f81bf 100644 --- a/Application/Admin/Model/UserModel.class.php +++ b/Application/Admin/Model/UserModel.class.php @@ -831,15 +831,6 @@ class UserModel extends Model{ if( C('UC_OPEN')==1 ){ $res = uc_user_edit($user['account'],'',$data['password'],'',1); if($res != 1) {return false;} - /** - * 同步修改其他站点用户密码 - */ - $domain = C('UC_OTHER_WEB_URL'); - $username = get_user_account($data['id']); - if(!empty($domain)){ - $url = "http://{$domain}/Api/user/editPassword?account={$username}&type=1&newpsw={$data['password']}"; - $aa = json_decode(file_get_contents($url),true); - } } $u_map['uid']=$data['id']; diff --git a/Application/Admin/View/Action/actionlog.html b/Application/Admin/View/Action/actionlog.html index 9e2b2e912..9779bb884 100644 --- a/Application/Admin/View/Action/actionlog.html +++ b/Application/Admin/View/Action/actionlog.html @@ -50,7 +50,9 @@
- 导出 + + 导出 + {$_page}
diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index 0b15961f2..9cadb3b0a 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -310,7 +310,7 @@
- + 导出 diff --git a/Application/Admin/View/Apply/and_lists.html b/Application/Admin/View/Apply/and_lists.html index 15f2f3dba..2d532e612 100644 --- a/Application/Admin/View/Apply/and_lists.html +++ b/Application/Admin/View/Apply/and_lists.html @@ -349,7 +349,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Apply/app_lists.html b/Application/Admin/View/Apply/app_lists.html index 685943f36..9095c3126 100644 --- a/Application/Admin/View/Apply/app_lists.html +++ b/Application/Admin/View/Apply/app_lists.html @@ -145,7 +145,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/AuthManager/index.html b/Application/Admin/View/AuthManager/index.html index a033d8a2b..5e19eb690 100644 --- a/Application/Admin/View/AuthManager/index.html +++ b/Application/Admin/View/AuthManager/index.html @@ -69,7 +69,9 @@
+ 导出 + {$_page}
diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index d998b0327..46478e49d 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -187,7 +187,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/BehaviorLog/singleSupplement.html b/Application/Admin/View/BehaviorLog/singleSupplement.html index ab2778f69..5e4fda619 100644 --- a/Application/Admin/View/BehaviorLog/singleSupplement.html +++ b/Application/Admin/View/BehaviorLog/singleSupplement.html @@ -158,7 +158,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/BindRechargeRecord/lists.html b/Application/Admin/View/BindRechargeRecord/lists.html index f819b7b90..94780ed7e 100644 --- a/Application/Admin/View/BindRechargeRecord/lists.html +++ b/Application/Admin/View/BindRechargeRecord/lists.html @@ -184,7 +184,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/BusinessAffairs/lists.html b/Application/Admin/View/BusinessAffairs/lists.html index db2564dd1..3db186069 100644 --- a/Application/Admin/View/BusinessAffairs/lists.html +++ b/Application/Admin/View/BusinessAffairs/lists.html @@ -128,7 +128,9 @@
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/DeductBindRecord/recordLists.html b/Application/Admin/View/DeductBindRecord/recordLists.html index cfcd1fda5..b2e0a8dc1 100644 --- a/Application/Admin/View/DeductBindRecord/recordLists.html +++ b/Application/Admin/View/DeductBindRecord/recordLists.html @@ -84,7 +84,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index eb155b224..5b58247f1 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -217,7 +217,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html index 380119bc6..c79fed93c 100644 --- a/Application/Admin/View/Deposit/lists_secord.html +++ b/Application/Admin/View/Deposit/lists_secord.html @@ -189,7 +189,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Developers/lists.html b/Application/Admin/View/Developers/lists.html index b22cf521b..570dca099 100644 --- a/Application/Admin/View/Developers/lists.html +++ b/Application/Admin/View/Developers/lists.html @@ -153,7 +153,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Finance/coinDetail.html b/Application/Admin/View/Finance/coinDetail.html index 590489b05..aa7e2e53c 100644 --- a/Application/Admin/View/Finance/coinDetail.html +++ b/Application/Admin/View/Finance/coinDetail.html @@ -52,8 +52,10 @@
搜索 - - 导出 + + + 导出 +
diff --git a/Application/Admin/View/Finance/definiteDetaile.html b/Application/Admin/View/Finance/definiteDetaile.html index d907880ea..6886d70fc 100644 --- a/Application/Admin/View/Finance/definiteDetaile.html +++ b/Application/Admin/View/Finance/definiteDetaile.html @@ -114,7 +114,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index b07504169..52a6cab69 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -74,7 +74,7 @@

{$_REQUEST['count_date']}游戏统计

-

说明：仅统计通知成功

+

说明：仅统计通知成功,结算给上游的是支付成功通知成功，就算给公会的是支付成功

@@ -132,17 +132,19 @@ 搜索 - 导出 + + 导出 +
@@ -174,6 +176,8 @@
游戏内充值合计游戏现金金额+平台币直充支出+平台币内充支出
+
通知失败合计所有通知失败的合计金额
+ 操作 @@ -218,6 +222,7 @@ 'pay_way'=>-1, false))}">{$data.inside_cash_count}0 {$data.all_cash_count}0 + {$data.notice_fail_count}0 {$sumBalance}0 {$sumInside}0 {$sumAll}0 + {$sumNoticeFail}0 搜索 - - 导出 + + + 导出 + diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html index c32f57384..65b6d0234 100644 --- a/Application/Admin/View/Finance/payTypeStatistics.html +++ b/Application/Admin/View/Finance/payTypeStatistics.html @@ -100,9 +100,11 @@ 搜索 - 导出 + + 导出 + diff --git a/Application/Admin/View/Finance/valueDetail.html b/Application/Admin/View/Finance/valueDetail.html index b894fbe00..10e3332a6 100644 --- a/Application/Admin/View/Finance/valueDetail.html +++ b/Application/Admin/View/Finance/valueDetail.html @@ -191,8 +191,10 @@
- 导出 - {$_page|default=''} + + 导出 + + {$_page|default=''}
diff --git a/Application/Admin/View/FinanceCompare/index.html b/Application/Admin/View/FinanceCompare/index.html index 07e32a33b..d8a4c17d4 100644 --- a/Application/Admin/View/FinanceCompare/index.html +++ b/Application/Admin/View/FinanceCompare/index.html @@ -153,7 +153,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/FinancePromote/gameCoinDetail.html b/Application/Admin/View/FinancePromote/gameCoinDetail.html index fed4c5f48..e3a9a968b 100644 --- a/Application/Admin/View/FinancePromote/gameCoinDetail.html +++ b/Application/Admin/View/FinancePromote/gameCoinDetail.html @@ -149,8 +149,10 @@
- 导出 + + 导出 + {$_page}
 diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index 434300fd5..553f6b7bc 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -241,7 +241,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index 6239bbe8c..05ad5bb90 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -223,7 +223,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 1df86597f..a7fe7c099 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -269,8 +269,10 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/FinancePromote/insideCoinDetail.html b/Application/Admin/View/FinancePromote/insideCoinDetail.html index 2510b068a..536173075 100644 --- a/Application/Admin/View/FinancePromote/insideCoinDetail.html +++ b/Application/Admin/View/FinancePromote/insideCoinDetail.html @@ -91,8 +91,10 @@
- 导出 + + 导出 + {$_page}
 diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html index 7f208a09c..aa254ef6b 100644 --- a/Application/Admin/View/FinancePromote/promoteUser.html +++ b/Application/Admin/View/FinancePromote/promoteUser.html @@ -238,8 +238,10 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 27a7ca79f..4db4ca49f 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -718,6 +718,7 @@ diff --git a/Application/Admin/View/Game/lists.html b/Application/Admin/View/Game/lists.html index 5991d6528..dac9c34b2 100644 --- a/Application/Admin/View/Game/lists.html +++ b/Application/Admin/View/Game/lists.html @@ -355,7 +355,9 @@ text-indent:0;
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/GameSource/lists.html b/Application/Admin/View/GameSource/lists.html index b68e3658e..e297cabb0 100644 --- a/Application/Admin/View/GameSource/lists.html +++ b/Application/Admin/View/GameSource/lists.html @@ -160,7 +160,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/GameType/lists.html b/Application/Admin/View/GameType/lists.html index 311902c52..5ca7ab7af 100644 --- a/Application/Admin/View/GameType/lists.html +++ b/Application/Admin/View/GameType/lists.html @@ -155,7 +155,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Giftbag/lists.html b/Application/Admin/View/Giftbag/lists.html index eae2a6e6d..159aa7a8f 100644 --- a/Application/Admin/View/Giftbag/lists.html +++ b/Application/Admin/View/Giftbag/lists.html @@ -244,7 +244,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Giftbag/record.html b/Application/Admin/View/Giftbag/record.html index ce7a1111d..6e807c933 100644 --- a/Application/Admin/View/Giftbag/record.html +++ b/Application/Admin/View/Giftbag/record.html @@ -98,7 +98,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Launch/data.html b/Application/Admin/View/Launch/data.html index 82288f759..00fb2833f 100644 --- a/Application/Admin/View/Launch/data.html +++ b/Application/Admin/View/Launch/data.html @@ -250,7 +250,7 @@
- + - + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 1a3c9047c..7db1f436e 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -172,7 +172,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 4356117e7..dbac7fc44 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -375,7 +375,7 @@
- + 导出 diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html index 98ec0d32c..f84c816b9 100644 --- a/Application/Admin/View/Mend/lists.html +++ b/Application/Admin/View/Mend/lists.html @@ -167,7 +167,7 @@
- + 导出 diff --git a/Application/Admin/View/Mend/recordList.html b/Application/Admin/View/Mend/recordList.html index ca777c835..189d2334f 100644 --- a/Application/Admin/View/Mend/recordList.html +++ b/Application/Admin/View/Mend/recordList.html @@ -124,7 +124,9 @@
- 导出 + + 导出 +
{$_page|default=''}
diff --git a/Application/Admin/View/Merchandise/lists.html b/Application/Admin/View/Merchandise/lists.html index 0e890cbbf..742cda11d 100644 --- a/Application/Admin/View/Merchandise/lists.html +++ b/Application/Admin/View/Merchandise/lists.html @@ -181,7 +181,9 @@ text-indent:0;
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Msg/lists.html b/Application/Admin/View/Msg/lists.html index 26dc75f3f..fc35de9ee 100644 --- a/Application/Admin/View/Msg/lists.html +++ b/Application/Admin/View/Msg/lists.html @@ -75,7 +75,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Order/lists.html b/Application/Admin/View/Order/lists.html index 4732a8388..b1ddf84b4 100644 --- a/Application/Admin/View/Order/lists.html +++ b/Application/Admin/View/Order/lists.html @@ -167,7 +167,9 @@ text-indent:0;
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index a7cb8fdfe..b70f0a933 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -76,7 +76,9 @@ 搜索
- 导出excel + + 导出excel +
diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index 3839b3798..0995074c5 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -101,9 +101,11 @@ 搜索 - - 导出 + + + 导出 + diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 48823d5a0..6e26d4b17 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -119,9 +119,11 @@
搜索 - 导出 + + 导出 +
diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 5187e4c7d..043e0e0df 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -97,9 +97,11 @@ 搜索 - - 导出 + + + 导出 + diff --git a/Application/Admin/View/PayChannelIntention/detail.html b/Application/Admin/View/PayChannelIntention/detail.html index 94a0ec0d0..b3d1330e0 100644 --- a/Application/Admin/View/PayChannelIntention/detail.html +++ b/Application/Admin/View/PayChannelIntention/detail.html @@ -332,7 +332,7 @@
- + 导出 diff --git a/Application/Admin/View/PayChannelIntention/index.html b/Application/Admin/View/PayChannelIntention/index.html index 537069c5c..b35564d13 100644 --- a/Application/Admin/View/PayChannelIntention/index.html +++ b/Application/Admin/View/PayChannelIntention/index.html @@ -318,7 +318,7 @@
- + 导出 diff --git a/Application/Admin/View/Platform/game_statistics.html b/Application/Admin/View/Platform/game_statistics.html index 59caae43b..c9c4ed67d 100644 --- a/Application/Admin/View/Platform/game_statistics.html +++ b/Application/Admin/View/Platform/game_statistics.html @@ -161,7 +161,7 @@
- + - + 导出 diff --git a/Application/Admin/View/Platform/payway_statistics.html b/Application/Admin/View/Platform/payway_statistics.html index e57d6b0c6..ddf7c2c6e 100644 --- a/Application/Admin/View/Platform/payway_statistics.html +++ b/Application/Admin/View/Platform/payway_statistics.html @@ -126,7 +126,7 @@
- + 导出 diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index bc83d84e4..1c3959f93 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -165,7 +165,7 @@
- + 导出 diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index 53fd236c2..fcf74cf17 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -171,7 +171,7 @@
- + 导出 diff --git a/Application/Admin/View/Platform/resway_statistics.html b/Application/Admin/View/Platform/resway_statistics.html index 149bfd720..0583b3e4e 100644 --- a/Application/Admin/View/Platform/resway_statistics.html +++ b/Application/Admin/View/Platform/resway_statistics.html @@ -131,7 +131,7 @@
- + 导出 diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html index 8fc6236d0..6a8858fda 100644 --- a/Application/Admin/View/PresidentDeposit/records.html +++ b/Application/Admin/View/PresidentDeposit/records.html @@ -184,7 +184,7 @@
- + 导出 diff --git a/Application/Admin/View/Promote/agent_list.html b/Application/Admin/View/Promote/agent_list.html index 2f491614f..fdf69a099 100644 --- a/Application/Admin/View/Promote/agent_list.html +++ b/Application/Admin/View/Promote/agent_list.html @@ -137,7 +137,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Promote/ch_reg_list.html b/Application/Admin/View/Promote/ch_reg_list.html index ce95c08ea..fe2db3efa 100644 --- a/Application/Admin/View/Promote/ch_reg_list.html +++ b/Application/Admin/View/Promote/ch_reg_list.html @@ -181,7 +181,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 548bd4ab3..448b05aca 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -339,7 +339,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Promote/spend_list.html b/Application/Admin/View/Promote/spend_list.html index 10843bd6b..d28164c75 100644 --- a/Application/Admin/View/Promote/spend_list.html +++ b/Application/Admin/View/Promote/spend_list.html @@ -244,7 +244,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/PromoteCoin/deduct_lists.html b/Application/Admin/View/PromoteCoin/deduct_lists.html index 63c9093f0..21b6753b7 100644 --- a/Application/Admin/View/PromoteCoin/deduct_lists.html +++ b/Application/Admin/View/PromoteCoin/deduct_lists.html @@ -157,8 +157,10 @@
- 导出 - {$_page|default=''} + + 导出 + + {$_page|default=''}
diff --git a/Application/Admin/View/PromoteCoin/record.html b/Application/Admin/View/PromoteCoin/record.html index 0747da3e6..f949fce5b 100644 --- a/Application/Admin/View/PromoteCoin/record.html +++ b/Application/Admin/View/PromoteCoin/record.html @@ -134,7 +134,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/PromoteCoin/send_lists.html b/Application/Admin/View/PromoteCoin/send_lists.html index df25d2a68..43f5362af 100644 --- a/Application/Admin/View/PromoteCoin/send_lists.html +++ b/Application/Admin/View/PromoteCoin/send_lists.html @@ -115,7 +115,9 @@
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 742d7e813..7413a8406 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -355,18 +355,18 @@ var obj = { "company_name":["required","推广公司名称不允许为空"], "platform_name":["nocheck"], - // "contact_begin":["date","合同开始时间不能为空"], - // "contact_end":["date","合同结束时间不能为空"], + "contact_begin":["nocheck","合同开始时间不能为空"], + "contact_end":["nocheck","合同结束时间不能为空"], "fax_ratio":["number","开票税率必须是数字，如果无此项请填0"], "company_type":["required","公司性质不能为空","select"], "is_sign_contact":["required","是否签署合同项不能为空","select"], "company_belong":["required","团体归属不能为空","select"], "settlement_contact":["required","结算联系人不能为空"], "contact_phone":["phone","联系人电话格式不对或不能为空"], - // "address":["required","联系人地址不能为空"], - // "bank_card":["bankid","银行卡格式错误或不能为空"], - // "bank_name":["required","银行名称不能为空"], - // "bank_address":["required","银行开户网点不能为空"], + "address":["nocheck","联系人地址不能为空"], + "bank_card":["nocheck","银行卡格式错误或不能为空"], + "bank_name":["nocheck","银行名称不能为空"], + "bank_address":["nocheck","银行开户网点不能为空"], "content":["nocheck"], "status":["nocheck","","radio"] } diff --git a/Application/Admin/View/PromoteCompany/promotedataconfigindex.html b/Application/Admin/View/PromoteCompany/promotedataconfigindex.html new file mode 100644 index 000000000..98ac23e40 --- /dev/null +++ b/Application/Admin/View/PromoteCompany/promotedataconfigindex.html @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + +
+
+

业务配置

+
+ +
+ + + +
+ + + + + + + + + + + +
联盟分发订单归属: +
+ +
+
聚合平台订单归属: +
+ +
+
+ + +
+
+
+ + + 返回 + +
+ +
+
+ + + + + + + diff --git a/Application/Admin/View/PromoteGameRatio/lists.html b/Application/Admin/View/PromoteGameRatio/lists.html index 5d0461650..bfec4b3d9 100644 --- a/Application/Admin/View/PromoteGameRatio/lists.html +++ b/Application/Admin/View/PromoteGameRatio/lists.html @@ -209,7 +209,7 @@
- + 导出 diff --git a/Application/Admin/View/PromoteWelfare/lists.html b/Application/Admin/View/PromoteWelfare/lists.html index 0ff61788c..4fc16c7bc 100644 --- a/Application/Admin/View/PromoteWelfare/lists.html +++ b/Application/Admin/View/PromoteWelfare/lists.html @@ -265,7 +265,9 @@
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Query/cp_withdraw.html b/Application/Admin/View/Query/cp_withdraw.html index 2d1026449..6b6cf544a 100644 --- a/Application/Admin/View/Query/cp_withdraw.html +++ b/Application/Admin/View/Query/cp_withdraw.html @@ -158,7 +158,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Query/cpsettlement.html b/Application/Admin/View/Query/cpsettlement.html index ee2386713..7dd6ddf70 100644 --- a/Application/Admin/View/Query/cpsettlement.html +++ b/Application/Admin/View/Query/cpsettlement.html @@ -229,8 +229,10 @@
- - 导出 + + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Query/settlement.html b/Application/Admin/View/Query/settlement.html index 74123ec83..4e10a6665 100644 --- a/Application/Admin/View/Query/settlement.html +++ b/Application/Admin/View/Query/settlement.html @@ -234,7 +234,7 @@
- + 导出 diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index 67937146e..eba56679a 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -214,7 +214,7 @@
- + 导出 diff --git a/Application/Admin/View/Rebate/lists.html b/Application/Admin/View/Rebate/lists.html index 0683bfc10..da3d5d44d 100644 --- a/Application/Admin/View/Rebate/lists.html +++ b/Application/Admin/View/Rebate/lists.html @@ -187,12 +187,14 @@
+ 导出 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html index c01990b4a..8a6a52156 100644 --- a/Application/Admin/View/RechargeSum/summation.html +++ b/Application/Admin/View/RechargeSum/summation.html @@ -153,7 +153,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Selfbuilt/index.html b/Application/Admin/View/Selfbuilt/index.html index 5d380cc44..b3a68f4d2 100644 --- a/Application/Admin/View/Selfbuilt/index.html +++ b/Application/Admin/View/Selfbuilt/index.html @@ -51,7 +51,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Server/lists.html b/Application/Admin/View/Server/lists.html index 4bb159751..f51119764 100644 --- a/Application/Admin/View/Server/lists.html +++ b/Application/Admin/View/Server/lists.html @@ -230,7 +230,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/ServerNotice/lists.html b/Application/Admin/View/ServerNotice/lists.html index 4644154bb..3583772a4 100644 --- a/Application/Admin/View/ServerNotice/lists.html +++ b/Application/Admin/View/ServerNotice/lists.html @@ -228,7 +228,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 438a93554..f7c6790c8 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -211,7 +211,8 @@ {:encryptStr(get_promote_account($data['promote_id']))} --> - {:get_promote_account($data['promote_id'])} + {$data['promote_account']} + {$data.spend_ip} @@ -289,7 +290,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Stat/device_survey.html b/Application/Admin/View/Stat/device_survey.html index 578617c9b..3435fe68b 100644 --- a/Application/Admin/View/Stat/device_survey.html +++ b/Application/Admin/View/Stat/device_survey.html @@ -434,11 +434,15 @@ -
导出
+
+ + 导出 + +
diff --git a/Application/Admin/View/Stat/user.html b/Application/Admin/View/Stat/user.html index d503f262b..923b28132 100644 --- a/Application/Admin/View/Stat/user.html +++ b/Application/Admin/View/Stat/user.html @@ -136,6 +136,7 @@
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Stat/userarpu.html b/Application/Admin/View/Stat/userarpu.html index de5c56d00..0a336bf3b 100644 --- a/Application/Admin/View/Stat/userarpu.html +++ b/Application/Admin/View/Stat/userarpu.html @@ -196,13 +196,15 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Stat/userretention.html b/Application/Admin/View/Stat/userretention.html index 1c3cf81e0..aafdbb393 100644 --- a/Application/Admin/View/Stat/userretention.html +++ b/Application/Admin/View/Stat/userretention.html @@ -141,14 +141,16 @@
- 导出 + + 导出 +
diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index 732090faa..7b4b9f5ec 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -163,7 +163,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/Statistics/ltv.html b/Application/Admin/View/Statistics/ltv.html index fe5a31fd4..35d99e86b 100644 --- a/Application/Admin/View/Statistics/ltv.html +++ b/Application/Admin/View/Statistics/ltv.html @@ -123,6 +123,7 @@
+ 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Statistics/overview.html b/Application/Admin/View/Statistics/overview.html index cde2794d0..27362c66d 100644 --- a/Application/Admin/View/Statistics/overview.html +++ b/Application/Admin/View/Statistics/overview.html @@ -375,11 +375,16 @@ -
+ + 导出
+ ),false)}">导出 + + +
diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index 396fd72ea..aad08ad17 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -183,7 +183,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index cce37590a..9cb4a9dc7 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -186,7 +186,7 @@
- + 导出 {$_page|default=''} diff --git a/Application/Admin/View/TestResource/index.html b/Application/Admin/View/TestResource/index.html index cfa496488..cdc995013 100644 --- a/Application/Admin/View/TestResource/index.html +++ b/Application/Admin/View/TestResource/index.html @@ -66,6 +66,21 @@
+
+ + - +
+
+ +
  @@ -92,8 +107,10 @@
+ 批量申请后续 新增测试账号 +
@@ -193,6 +210,7 @@