diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 52ae4ab44..bf22be7ba 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -2135,5 +2135,42 @@ function getPromoteGameRatio($promoteID = 0, $relationGameId = 0, $amount=0, $ti
     }
     return $ratio;
 }
+//验证账号
+function checkAccount($type,$account) {
+
+//        $type = I('type');
+//        $account = I('account');
+
+        $map = [];
+        $map['account'] = $account;
+
+        if ($type == 1) {
+
+            $result = M('promote','tab_')->field('account')->where($map)->find();
+
+        } else {
+            $result = M('user','tab_')->field('account')->where($map)->find();
+        }
+
+        if ($result) {
+            return 1;
+        } else {
+            return 0;
+        }
+
+    }
+//去重函数
+function a_array_unique($array){
+  $out = array();
+
+  foreach ($array as $key=>$value) {
+   if (!in_array($value, $out)){
+    $out[$key] = $value;
+   }
+  }
+
+  $out = array_values($out);
+  return $out;
+ }
 
 ?>
diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index 90a5f3ba0..f63370a9f 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -469,4 +469,75 @@ class AjaxController extends ThinkController{
 
     }
 
+    public function addfile()
+    {
+        $this->meta_title = '文档添加';
+        $template = I('t');
+        $template = $template ?: 'Partner/addfile';
+        return $this->display($template);
+    }
+
+    //处理上传图片
+    public function saveFile()
+    {
+        $path = '/Uploads/';
+        $upload = new \Think\Upload();// 实例化上传类
+        $upload->maxSize   =     0 ;// 设置附件上传大小
+        $upload->exts      =    '';// 设置附件上传类型
+        $upload->rootPath  =     '.'.$path; // 设置附件上传根目录
+        $upload->savePath  =     ''; // 设置附件上传（子）目录
+        // 上传文件
+        $info   =   $upload->upload();
+        // dump($info);
+        if(!$info) {// 上传错误提示错误信息
+            $msg = $upload->getError();
+            $array= array('status' => 0, 'info' => $msg);
+        }else{// 上传成功
+            $array=array(
+                "info"=>"上传成功",
+                "status"=>1,
+                "file_path"=>$path.$info['file']['savepath'].$info['file']['savename'],
+                "file_name"=>$_POST['file_name'],
+                "file_type"=>$_FILES['file']['type'],
+                "file_size"=>$_FILES['file']['size'],
+                "upload_time"=>date("Y-m-d H:i:s",time())
+            );
+        }
+        $this->ajaxReturn($array);
+    }
+    //删除图片
+    public function delFile()
+    {
+        $id = $_REQUEST['id'];
+        $index = $_REQUEST['index'] ?: false;
+        $file_path = $_REQUEST['file_path'] ?: false;
+        if($id == 0){
+            //未存入数据库，不用管
+            unlink("./".$file_path);
+            $this->ajaxReturn(array(
+                'status' => 1,
+                'info' => "删除成功"
+            ));
+        }
+        # code...
+    }
+
+    /**
+     *获取上下游公司
+     */
+    public function getCompanyList()
+    {
+        $company_type = I('company_type');//公司类型
+        if ($company_type ==1) {//上游公司
+            $data = M('partner','tab_')->field('id, partner as name,1 as type')->where(['status' => 1])->select();
+        } elseif ($company_type ==2) {//下游公司
+            $data = M('promote_company','tab_')->field('id, company_name  as name,2 as type')->where(['status' => 1])->select();
+        } else {
+            $partner = M('partner','tab_')->field('id, partner as name,1 as type')->where(['status' => 1])->select();
+            $promote_company = M('promote_company','tab_')->field('id, company_name as name, 2 as type')->where(['status' => 1])->select();
+            $data = array_merge($partner, $promote_company);
+        }
+        $this->ajaxReturn($data);
+    }
+
 }
\ No newline at end of file
diff --git a/Application/Admin/Controller/FinancialSummaryController.class.php b/Application/Admin/Controller/FinancialSummaryController.class.php
new file mode 100644
index 000000000..bd39dac4f
--- /dev/null
+++ b/Application/Admin/Controller/FinancialSummaryController.class.php
@@ -0,0 +1,128 @@
+<?php
+namespace Admin\Controller;
+class FinancialSummaryController extends AdminController
+{
+    public $keyname=array(
+       "cash_spend"=>"现金充值收入",
+        "balance_coin_spend"=>"平台币消耗",
+        "balance_coin_income"=>"平台币充值收入",
+        "game_supersign_income"=>"超级签购买收入",
+        "test_user_income"=>"测试收入",
+        "reward_count"=>"奖励",
+        "fine_count"=>"违规处罚",
+        "inside_count"=>"内团",
+        "outer_count"=>"外团",
+        "outer_branch_count"=>"外团-分发",
+        "other_group_count"=>"无归属团",
+        // "inside_count"=>"内团",
+        // "outer_count"=>"外团",
+        "gfwx_count"=>"官方-微信",
+        "gfzfb_count"=>"官方-支付宝",
+        "sqzfb_count"=>"双乾-支付宝",
+        "sqkj_count"=>"双乾-快捷",
+        "wx_count"=>"微信",
+        "zfb_count"=>"支付宝",
+        "kj_count"=>"快捷"
+    );
+    public function _initialize()
+    {
+        parent::_initialize();
+        // echo "<pre>";
+    }
+    public function index($p=1)
+    {
+        if(!array_key_exists("year",$_REQUEST) || !array_key_exists("type",$_REQUEST)){
+            $this->redirect(ACTION_NAME, array('year' => date('Y',time()),"type"=>2));
+        }
+        $this->getYearList();
+        $this->getYearData();
+        $this->display();
+
+    }
+    //获取指定年份数据
+    public function getYearData()
+    {
+        $senddata = array(
+            "income"=>[
+                "count"=>[0,0,0,0,0,0,0,0,0,0,0,0,0]
+            ],
+            "promote"=>[
+                "count"=>[0,0,0,0,0,0,0,0,0,0,0,0,0]
+            ],
+            "channel"=>[
+                "count"=>[0,0,0,0,0,0,0,0,0,0,0,0,0]
+            ],
+            "payway"=>[
+                "count"=>[0,0,0,0,0,0,0,0,0,0,0,0,0]
+            ]
+        );
+        $data = [];
+        //初始化数据
+        foreach ($this->keyname as $k => $v) {
+            $data[$k] = array("name"=>$v,"money"=>[0,0,0,0,0,0,0,0,0,0,0,0,0]);
+        }
+        $map = array(
+            "count_year"=>$_REQUEST['year'],
+            "type"=>array("IN","1,{$_REQUEST['type']},4,5")
+        );
+        $dbres = M("FinancialSummary","tab_")->field("*")->where($map)->select();
+        foreach ($dbres as $k => $v) {
+            if($v['type'] == 1){
+                if(!in_array($v['key_name'],$senddata['income']['list'])){
+                    $senddata['income']['list'][] = $v['key_name'];
+                }
+            }
+            if($v['type'] == 4){
+                if(!in_array($v['key_name'],$senddata['channel']['list'])){
+                    $senddata['channel']['list'][] = $v['key_name'];
+                }
+            }
+            if($v['type'] == 5){
+                if(!in_array($v['key_name'],$senddata['payway']['list'])){
+                    $senddata['payway']['list'][] = $v['key_name'];
+                }
+            }
+            if($v['type'] == $_REQUEST['type']){
+                if(!in_array($v['key_name'],$senddata['promote']['list'])){
+                    $senddata['promote']['list'][] = $v['key_name'];
+                }
+            }
+            $data[$v['key_name']]["money"][((int)$v['count_month']-1)] = $v['sum_money'];
+            # code...
+        }
+        foreach ($senddata as $k => $v) {
+            foreach ($v as $ke => $va) {
+                if($ke !='count'){
+                    foreach ($va as $key => $val) {
+                        for ($i=0; $i < 12; $i++) { 
+                            $data[$val]["money"][12] += $data[$val]["money"][$i];
+                            $senddata[$k]['count'][$i] += $data[$val]["money"][$i];
+                            $senddata[$k]['count'][12] +=$data[$val]["money"][$i];
+                        }
+                        $senddata[$k][$ke][$key] = $data[$val];
+                    }
+                }
+                
+            }
+        }
+        $this->assign('data', $senddata);
+    }
+    //获取历史年份
+    public function getYearList()
+    {
+        $star = 2019;
+        $end = date("Y",time());
+        $list = [];
+        for ($i=$star; $i <= $end; $i++) { 
+            $temp = array(
+                "value"=>$i,
+                "name"=>"{$i}年"
+            );
+            $list[] = $temp ;
+        }
+        $this->assign('YearList', $list);
+    }
+
+    
+    
+}
\ No newline at end of file
diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php
new file mode 100644
index 000000000..2f49c500a
--- /dev/null
+++ b/Application/Admin/Controller/FinancialSummarySetController.class.php
@@ -0,0 +1,475 @@
+<?php
+namespace Admin\Controller;
+
+/**
+ * 游戏流水聚合接口
+ * @author chenzhi
+ */
+class FinancialSummarySetController extends \Think\Controller
+{
+    public $beginThismonth;
+    public $endThismonth;
+    public $date;
+    public $nowdata;
+    public $month;//月份
+    public $year;//年份
+    public $adddata;//要添加的数据
+    //数据库
+    public $FinancialSummaryModel;
+    public function _initialize(){
+        
+        //初始化
+        $this->beginThismonth = mktime(0,0,0,date('m')-1,1,date('Y'));
+        $this->endThismonth = mktime(0,0,0,date('m'),1,date('Y'))-1;
+        $temp = strtotime(date('Y-m-01 00:00:00',strtotime('-1 month')));
+        $this->year= date('Y',$temp);
+        $this->month= date('m',$temp);
+        $this->date = $this->year."-".$this->month;
+        $this->nowdata =time();
+        
+        $this->FinancialSummaryModel =M("FinancialSummary",'tab_');
+        $this->DepositModel =M("Deposit",'tab_');
+        $this->SpendModel = M("Spend",'tab_');
+        $this->GameSupersignModel = M("GameSupersign",'tab_');
+        $this->CoinPayOrderModel = M("CoinPayOrder",'tab_');//会长充值平台币表
+
+
+    }
+    /**
+     * 更新某月数据
+     */
+    public function setMonthFinancialSummary($count_date)
+    {
+        $month = $count_date;
+        if(empty($month)) die("参数错误");
+
+        $this->adddata = [];//置空否者会脚本进来会重复计算
+        $this->date =  $month;
+        $tarry = explode('-',$month);
+        $this->year= $tarry[0];
+        if(strlen($tarry[1]) < 2) $tarry[1]="0".$tarry[1];
+
+        $this->month= $tarry[1];
+        $this->beginThismonth=mktime(0,0,0,$tarry[1],1,$tarry[0]);
+        $this->endThismonth=mktime(0,0,0,$tarry[1]-0+1,1,$tarry[0])-1;
+        $this->reCount();
+        $this->setFinancialSummary();
+    }
+    /**
+     * 强制重新聚合
+     */
+    public function reCount()
+    {
+        $recount = I("recount");
+        if(empty($recount) || $recount != 1){return ;}
+        # code...
+        //清理之前的聚合
+        $temp =array(
+            "count_year"=>$this->year,
+            "count_month"=>$this->month
+        );
+        $this->FinancialSummaryModel->where($temp)->delete();
+        echo "重置成功执行重新生成:";
+    }
+
+
+    /**
+     * 每个月的统计接口
+     */
+    public function setFinancialSummary()
+    {
+        set_time_limit(0);
+        $t1 = microtime(true);
+        //判断是否已经聚合
+        $countRes = $this->FinancialSummaryModel->field("IFNULL(COUNT(*),0) count")->where("count_year = '{$this->year}' and count_month= '{$this->month}'")->find()['count'];
+        if($countRes > 0){
+            die("error:Repeated statistics,msg:{$this->date}已经聚合过");
+        }
+
+        //按收入类型
+        $this->setIncomeMoney();
+        //按合作方类型
+        $this->setPromoteMoney();
+        //支付渠道/支付类型
+        $this->setPayWayMoney();
+        //存入数据
+        $this->addDb();
+
+        $t2 = microtime(true);
+        echo ("success {$this->date}:ok runtime:".round($t2-$t1,3).'s'.PHP_EOL);
+    }
+    /**
+     * 获取类型为1的数据,按收入类型
+     */
+    public function setIncomeMoney()
+    {
+        $this->getCashAndBalanCoinSpend();
+        $this->getBalanceCoinIncome();
+        $this->getGameSupersignIncome();
+        $this->getTestUserIncome();
+        $this->getRewardRecordIncome();
+    }
+    //现金充值及平台币消耗
+    protected function getCashAndBalanCoinSpend()
+    {
+
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        $res = $this->SpendModel
+                    ->field("IFNULL(SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END),0) as cash_count,IFNULL(SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END),0) as balance_coin_count")
+                    ->where($map)
+                    ->find();
+        $cash_spend["key_name"] = "cash_spend";
+        $cash_spend["type"] = 1;
+
+        $cash_spend["sort"] = 1;
+        $cash_spend["sum_money"] = $res['cash_count'];
+        $this->adddata[]=$cash_spend;
+
+        $balance_coin_spend["key_name"] = "balance_coin_spend";
+        $balance_coin_spend["type"] = 1;
+        $balance_coin_spend["sort"] = 2;
+        $balance_coin_spend["sum_money"] = $res['balance_coin_count'];
+        $this->adddata[]=$balance_coin_spend;
+    }
+    //平台币充值(deposit/CoinPayOrder)玩家及会长充值的平台币总额
+    protected function getBalanceCoinIncome()
+    {
+        $temparr = array(
+            "key_name"=>'balance_coin_income',
+            "type"=>1,
+            "sort"=>3,
+        );
+        $map = array(
+            "create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        $temparr['sum_money'] = $this->DepositModel->field("IFNULL(sum(pay_amount),0) pay_amount")->where($map)->find()['pay_amount'];
+        //获取会长充值的平台币
+        $map1= array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "order_status"=>array("EGT",1)
+        );
+        $COMoney= $this->CoinPayOrderModel->field("IFNULL(sum(pay_amount),0) pay_amount")->where($map1)->find()['pay_amount'];
+        $temparr['sum_money'] = number_format(($temparr['sum_money']*100+$COMoney*100)/100, 2, '.', '');
+        $this->adddata[]=$temparr;
+    }
+    //超级签购买收入
+    protected function getGameSupersignIncome()
+    {
+        $temparr = array(
+            "key_name"=>'game_supersign_income',
+            "type"=>1,
+            "sort"=>4,
+        );
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        $temparr['sum_money'] = $this->GameSupersignModel->field("IFNULL(sum(pay_price),0) pay_price")->where($map)->find()['pay_price'];
+        $this->adddata[]=$temparr;
+    }
+    //测试账号收入
+    protected function getTestUserIncome()
+    {
+        $temparr = array(
+            "key_name"=>'test_user_income',
+            "type"=>1,
+            "sort"=>5
+        );
+        //获取测试白名单
+        $testlist = M("TestWhiteList",'tab_')->field("user_id")->select();
+        if($testlist){
+           $testlist = implode(",",array_column($testlist, 'user_id'));
+        }else{
+            $testlist = false; 
+        }
+        //获取现金充值
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1,
+            "pay_way"=>array("GT",0)
+        );
+        if($testlist) $map['user_id']=array("in",$testlist);
+        $cash_spend =  $this->SpendModel
+                            ->field("IFNULL(SUM(pay_amount),0) as pay_amount")
+                            ->where($map)
+                            ->find()['pay_amount'];
+        //获取平台币充值
+        $map1 = array(
+            "create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        if($testlist) $map1['user_id']=array("in",$testlist);
+        $deposit = $this->DepositModel->field("IFNULL(sum(pay_amount),0) pay_amount")->where($map1)->find()['pay_amount'];
+        $temparr['sum_money'] = number_format(($cash_spend*100+$deposit*100)/100, 2, '.', '');
+        $this->adddata[]=$temparr;
+    }
+    //奖罚收入
+    protected function getRewardRecordIncome()
+    {
+        $map = array(
+            "reward_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+        );
+        $rrres = M("RewardRecord","tab_")
+                ->field("
+                    IFNULL(SUM(CASE WHEN reward_type = 1 THEN money ELSE 0 END),0) as reward_count,
+                    IFNULL(SUM(CASE WHEN reward_type = 2 THEN money ELSE 0 END),0) as fine_count
+                    ")
+                ->where($map)
+                ->find();
+        //奖励负，惩罚正
+        $this->adddata[] = array(
+            "key_name"=>'reward_count',
+            "type"=>1,
+            "sort"=>6,
+            'sum_money'=>$rrres['reward_count']
+        );
+        $this->adddata[] = array(
+            "key_name"=>'fine_count',
+            "type"=>1,
+            "sort"=>7,
+            'sum_money'=>$rrres['fine_count']
+        );
+    }
+    /**
+     * 获取类型为2,3的数据/按合作方类型
+     */
+    public function setPromoteMoney()
+    {
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        $res = $this->SpendModel
+                    ->alias('s')
+                    ->field("IFNULL(SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END),0) as cash_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END),0) as balance_coin_count,
+                            IFNULL(SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END),0) as bind_coin_count,
+                            promote.company_belong")
+                    ->where($map)
+                    ->join("tab_promote promote ON s.promote_id = promote.id", "left")
+                    ->group("company_belong")
+                    ->select();
+        $inside_count = 0;//内团
+        $outer_count = 0;//外团
+        $outer_branch_count = 0;//外团分发
+        $other_group_count = 0;//其他
+        
+
+        $inside_nobind_count = 0;
+        $outer_nobind_count = 0;
+        $outer_branch_nobind_count = 0;
+        $other_group_nobind_count = 0;//其他
+        foreach ($res as $k => $v) {
+            if($v['company_belong'] == 1){
+                $outer_count = $v['cash_count']*100+$v['balance_coin_count']*100+$v['bind_coin_count']*100;
+                $outer_nobind_count = $v['cash_count']*100+$v['balance_coin_count']*100;
+            }elseif($v['company_belong'] == 2){
+                //外团分发
+                $outer_branch_count = $v['cash_count']*100+$v['balance_coin_count']*100+$v['bind_coin_count']*100;
+                $outer_branch_nobind_count = $v['cash_count']*100+$v['balance_coin_count']*100;
+            }elseif($v['company_belong'] == 3){
+                //其他
+                $other_group_count = $v['cash_count']*100+$v['balance_coin_count']*100+$v['bind_coin_count']*100;
+                $other_group_nobind_count = $v['cash_count']*100+$v['balance_coin_count']*100;
+            }else{
+                //有可能存在官方渠道，company_belong=null
+                $inside_count += ($v['cash_count']*100+$v['balance_coin_count']*100+$v['bind_coin_count']*100);
+                $inside_nobind_count += ($v['cash_count']*100+$v['balance_coin_count']*100);
+            }
+        }
+        //处理数据
+        $this->adddata[] = array(
+            "key_name"=>'inside_count',
+            "type"=>2,"sort"=>1,
+            "sum_money"=>number_format($inside_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'outer_count',
+            "type"=>2,"sort"=>2,
+            "sum_money"=>number_format($outer_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'outer_branch_count',
+            "type"=>2,"sort"=>3,
+            "sum_money"=>number_format($outer_branch_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'other_group_count',
+            "type"=>2,"sort"=>4,
+            "sum_money"=>number_format($other_group_count/100, 2, '.', '')
+        );
+        //不含绑定币
+        $this->adddata[] = array(
+            "key_name"=>'inside_count',
+            "type"=>3,"sort"=>1,
+            "sum_money"=>number_format($inside_nobind_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'outer_count',
+            "type"=>3,"sort"=>2,
+            "sum_money"=>number_format($outer_nobind_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'outer_branch_count',
+            "type"=>3,"sort"=>3,
+            "sum_money"=>number_format($outer_branch_nobind_count/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'other_group_count',
+            "type"=>3,"sort"=>4,
+            "sum_money"=>number_format($other_group_nobind_count/100, 2, '.', '')
+        );
+    }
+    /**
+     * 获取类型为4,5的数据/按支付渠道类型,支付类型类型
+     */
+    public function setPayWayMoney()
+    {
+        $moneyarry=[
+            "wx"=>0,
+            "zfb"=>0,
+            "gfzfb"=>0,
+            "sqzfb"=>0,
+            "sqkj"=>0
+        ];
+        $this->getSpendPayWay($moneyarry);
+        $this->getGameSupersignPayWay($moneyarry);
+        $this->getDepositPayWay($moneyarry);
+        $this->getCoinPayOrderPayWay($moneyarry);
+        //统计数据
+        $moneyarry['zfb'] = ($moneyarry['gfzfb']-0+$moneyarry['sqzfb']);
+        $this->adddata[] = array(
+            "key_name"=>'gfwx_count',
+            "type"=>4,"sort"=>1,
+            "sum_money"=>number_format($moneyarry['wx']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'gfzfb_count',
+            "type"=>4,"sort"=>2,
+            "sum_money"=>number_format($moneyarry['gfzfb']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'sqzfb_count',
+            "type"=>4,"sort"=>3,
+            "sum_money"=>number_format($moneyarry['sqzfb']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'sqkj_count',
+            "type"=>4,"sort"=>4,
+            "sum_money"=>number_format($moneyarry['sqkj']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'wx_count',
+            "type"=>5,"sort"=>1,
+            "sum_money"=>number_format($moneyarry['wx']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'zfb_count',
+            "type"=>5,"sort"=>2,
+            "sum_money"=>number_format($moneyarry['zfb']/100, 2, '.', '')
+        );
+        $this->adddata[] = array(
+            "key_name"=>'kj_count',
+            "type"=>5,"sort"=>3,
+            "sum_money"=>number_format($moneyarry['sqkj']/100, 2, '.', '')
+        );
+    }
+    //获取spend表
+    protected function getSpendPayWay(&$moneyarry){
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1,
+            "pay_way"=>array("IN","1,2,3,9,15")
+        );
+        $dbres=$this->SpendModel
+                    ->field("
+                        IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_amount ELSE 0 END),0) as wxsm_count,
+                        IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count,
+                        IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count,
+                        IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count,
+                        IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count
+                        ")
+                    ->where($map)
+                    ->find();
+        $moneyarry['wx'] += ($dbres['wxsm_count']*100+$dbres['wxapp_count']*100);
+        $moneyarry['gfzfb'] += $dbres['zfbgf_count']*100;
+        $moneyarry['sqzfb'] += $dbres['zfbsq_count']*100;
+        $moneyarry['sqkj'] += $dbres['kjsq_count']*100;
+    }
+    //获取超级签购买
+    protected function getGameSupersignPayWay(&$moneyarry)
+    {
+        $map = array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1
+        );
+        $dbres=$this->GameSupersignModel
+                    ->field("
+                        IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_price ELSE 0 END),0) as wx_count,
+                        IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as zfb_count
+                      ")
+                    ->where($map)
+                    ->find();
+        $moneyarry['wx'] += $dbres['wx_count']*100;
+        $moneyarry['gfzfb'] += $dbres['zfb_count']*100;
+    }
+    //玩家购买平台币
+    protected function getDepositPayWay(&$moneyarry)
+    {
+        $map = array(
+            "create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "pay_status"=>1,
+            "pay_way"=>array("IN","1,2,3,9,15")
+        );
+        $dbres=$this->DepositModel
+                    ->field("
+                            IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_amount ELSE 0 END),0) as wxsm_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count
+                        ")
+                    ->where($map)
+                    ->find();
+        $moneyarry['wx'] += ($dbres['wxsm_count']*100+$dbres['wxapp_count']*100);
+        $moneyarry['gfzfb'] += $dbres['zfbgf_count']*100;
+        $moneyarry['sqzfb'] += $dbres['zfbsq_count']*100;
+        $moneyarry['sqkj'] += $dbres['kjsq_count']*100;
+    }
+    //会长充值平台币
+    protected function getCoinPayOrderPayWay(&$moneyarry)
+    {
+        $map= array(
+            "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
+            "order_status"=>array("EGT",1)
+        );
+        $dbres= $this->CoinPayOrderModel
+                        ->field("
+                            IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_amount ELSE 0 END),0) as wx_count,
+                            IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfb_count
+                            ")
+                        ->where($map)
+                        ->find();
+        $moneyarry['wx'] += $dbres['wx_count']*100;
+        $moneyarry['gfzfb'] += $dbres['zfb_count']*100;
+    }
+    public function addDb()
+    {
+        foreach ($this->adddata as $k=> &$v) {
+            $v["count_month"] = $this->month;
+            $v["count_year"] = $this->year;
+            $v["create_time"] = $this->nowdata;
+        }
+       $res = $this->FinancialSummaryModel->addAll($this->adddata);
+       if(!$res){
+           echo "DB save error";
+       }else{
+
+       }
+    }
+ 
+}
diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index ebedb84e4..e8d1a2579 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -176,10 +176,10 @@ class GameController extends ThinkController
             $downloadWays = $_POST['download_ways'] ?? [];
             if (in_array(GameService::DOWNLOAD_BETA, $downloadWays)) {
                 if (empty($_POST['beta_url'])) {
-                    return $this->error("请在Beta按钮开启的情况填写Beta链接");
+                    return $this->error("请在极速版下载按钮开启的情况填写极速版下载链接");
                 }
                 if (!preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
-                    return $this->error("请填写正确的Beta链接");
+                    return $this->error("请填写正确的极速版下载链接");
                 }
             }
             $_POST['relation_game_name'] = $_POST['game_name'];
@@ -355,10 +355,10 @@ class GameController extends ThinkController
             $downloadWays = $_POST['download_ways'] ?? [];
             if (in_array(GameService::DOWNLOAD_BETA, $downloadWays)) {
                 if (empty($_POST['beta_url'])) {
-                    return $this->error("请在Beta按钮开启的情况填写Beta链接");
+                    return $this->error("请在极速版下载按钮开启的情况填写极速版下载链接");
                 }
                 if (!preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
-                    return $this->error("请填写正确的Beta链接");
+                    return $this->error("请填写正确的极速版下载链接");
                 }
             }
             /*if($_POST['apply_status']==0&&$_POST['game_status']==1){
diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php
index 37283c3ce..30e95b003 100644
--- a/Application/Admin/Controller/OldCountController.class.php
+++ b/Application/Admin/Controller/OldCountController.class.php
@@ -1,4 +1,5 @@
 <?php
+use Admin\FinancialSummarySetController;
 namespace Admin\Controller;
 
 /**
@@ -7,6 +8,20 @@ namespace Admin\Controller;
  */
 class OldCountController extends \Think\Controller
 {
+    //财务分类汇总统计旧数据聚合
+    public function FinancialSummaryInit()
+    {
+        //清空数据库
+        $sql = "truncate table tab_financial_summary";
+        $res = M()->execute($sql);
+        echo "tab_financial_summary 清空成功".PHP_EOL;
+        //获取19年9月到上个月的所有月份
+        $monthList = $this->getMonthsList();
+        $Financial = new FinancialSummarySetController();
+        foreach ($monthList as $k => $v) {
+            $Financial->setMonthFinancialSummary($v);
+        }
+    }
     //超级签订单新增识别微信或者支付宝2019-12-11
     public function gameSupersignPaywayInit()
     {
@@ -87,5 +102,25 @@ class OldCountController extends \Think\Controller
         }
         die("init ok");
     }
+    //获取公司月结所需要的所有月份截止至上个月
+    public function getMonthsList()
+    {
+        $start_month = "2019-09";
+
+        $temp = strtotime(date('Y-m-01 00:00:00',strtotime('-1 month')));
+        $end_month = date('Y',$temp)."-".date('m',$temp);
+
+        $time_arr = [];
+        $begin = new \DateTime($start_month);
+        $end = new \DateTime($end_month);
+        $end = $end->modify('+1 month');
+        $interval = new \DateInterval('P1M');
+        $daterange = new \DatePeriod($begin, $interval ,$end);
+        foreach($daterange as $date){
+            $time_arr[] = $date->format("Y-m");
+        }
+        return $time_arr;
+    }
+    
     
 }
diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 563f7f621..2f96fe607 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -62,7 +62,7 @@ class PartnerController extends ThinkController
         //获取分页数据
         $query = $model->alias('p')
             ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
-            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark")
+            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
             ->where($map)
             ->order("id desc");
         if($is_export){
@@ -98,9 +98,10 @@ class PartnerController extends ThinkController
             ->select();
 
 //        dd($cp_game_ratio_map);
-        $parseGameRadiores = array();
+        $parseGameRadiores = array();//合作方分成比例
         foreach ($gameradiores as $key =>$val) {
             $val['row'] = 1;
+            $val['my_ratio'] = 100 - $val['ratio'];
             if ($val['begin_total_amount'] == 0) {
                 $val['name'] = '默认比例';
                 if (isset($parseGameRadiores[$val['game_id']])) {
@@ -115,18 +116,25 @@ class PartnerController extends ThinkController
             }
             $parseGameRadiores[$val['game_id']][] = $val;
         }
-//        dd($parseGameRadiores);
+        $myGameRadiores = $parseGameRadiores;//我方分成比例
+        foreach ($myGameRadiores as $key => &$val) {
+             foreach ($val as $k => &$v) {
+                 $v['ratio'] = 100 - $v['ratio'];
+             }
+        }
+
         $parseGames = array();
 
         foreach ($games as $key =>$val) {
             $val['game_ratio'] = $parseGameRadiores[$val['id']];
+            $val['my_game_ratio'] = $myGameRadiores[$val['id']];
             if(array_key_exists($val['id'],$parseGameRadiores)){//游戏有比例
                 $row2 = array_sum(array_column($val['game_ratio'], 'row')) ;
                 $val['row'] = empty($row2) ? 1: $row2;
             } else {
                 $val["row"] = 1;
             }
-
+            $val['original_package_name'] = $val['original_package_name'] ?: '-';
             $parseGames[$val['partner_id']][] = $val;
         }
 
@@ -146,15 +154,17 @@ class PartnerController extends ThinkController
             } elseif ($value['settlement_type'] == 2) {
                 $value['settlement_type'] = '月结';
             }
-
-            $value['contract_time'] = time_format($value['contract_start_time'], 'Y/m/d') . '-' .
-                time_format($value['contract_end_time'], 'Y/m/d');
+            $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
+            $contract_start_time = $value['contract_start_time'] ?
+                time_format($value['contract_start_time'], 'Y/m/d') : '-';
+            $contract_end_time = $value['contract_end_time'] ?
+                time_format($value['contract_end_time'], 'Y/m/d') : '-';
+            $value['contract_time'] = $contract_start_time . '-' . $contract_end_time;
             $row2 = array_sum(array_column($value['game'], 'row')) ;
             $value['row'] = empty($row2) ? 1: $row2;
             $parseData[$value['partner_id']][] = $value;
         }
         $parseData = array_values($parseData);
-
         if($is_export){
             $this->assign('listData', $parseData[0]);
             $this->display("export");
@@ -367,8 +377,12 @@ class PartnerController extends ThinkController
             if (empty($data)) {
                 $this->error('数据异常', U('lists'));
             }
-            $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
-            $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+            if ($data['contract_start_time']) {
+                $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
+            }
+            if ($data['contract_end_time']) {
+                $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+            }
             $data['channel_rate'] *= 100;//存的是小数，显示百分比
             $data['invoice_rate'] *= 100;//存的是小数，显示百分比
 //            dd($data);
@@ -405,55 +419,6 @@ class PartnerController extends ThinkController
         $this->success('删除成功', U('lists'));
     }
 
-    public function addfile()
-    {
-        $this->meta_title = '文档添加';
-        return $this->display();
-    }
 
-    //处理上传图片
-    public function saveFile()
-    {
-        $path = '/Uploads/';
-        $upload = new \Think\Upload();// 实例化上传类
-        $upload->maxSize   =     0 ;// 设置附件上传大小
-        $upload->exts      =    '';// 设置附件上传类型
-        $upload->rootPath  =     '.'.$path; // 设置附件上传根目录
-        $upload->savePath  =     ''; // 设置附件上传（子）目录
-        // 上传文件
-        $info   =   $upload->upload();
-        // dump($info);
-        if(!$info) {// 上传错误提示错误信息
-            $msg = $upload->getError();
-            $array= array('status' => 0, 'info' => $msg);
-        }else{// 上传成功
-            $array=array(
-                "info"=>"上传成功",
-                "status"=>1,
-                "file_path"=>$path.$info['file']['savepath'].$info['file']['savename'],
-                "file_name"=>$_POST['file_name'],
-                "file_type"=>$_FILES['file']['type'],
-                "file_size"=>$_FILES['file']['size'],
-                "upload_time"=>date("Y-m-d H:i:s",time())
-            );
-        }
-        $this->ajaxReturn($array);
-    }
-    //删除图片
-    public function delFile()
-    {
-        $id = $_REQUEST['id'];
-        $index = $_REQUEST['index'] ?: false;
-        $file_path = $_REQUEST['file_path'] ?: false;
-        if($id == 0){
-            //未存入数据库，不用管
-            unlink("./".$file_path);
-            $this->ajaxReturn(array(
-                'status' => 1,
-                'info' => "删除成功"
-            ));
-        }
-        # code...
-    }
 
 }
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 1cc6d854c..29f49cf76 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -59,6 +59,8 @@ class PromoteCompanyController extends ThinkController
         $companyids = implode(',', array_column($companyres, 'id'));
         //获取所属会长及其游戏分成
         $promotemap['company_id']=["in",$companyids];
+        $promotemap['level'] = 1;
+        
         $promoteres = M("Promote","tab_")
                     ->field("id,company_id,account,settlement_type")
                     ->where($promotemap)
@@ -177,20 +179,29 @@ class PromoteCompanyController extends ThinkController
             if($v['platform_name'] == '' || $v['platform_name'] == "0"){
                 $v['platform_name'] = "--";
             }
-            $v["is_sign_contact"] = ($v["is_sign_contact"]=="1" ? "是" :'否');
             
-
+            $v["is_sign_contact"] = ($v["is_sign_contact"]=="1" ? "是" :'否');
+            $v["company_type"] = ($v["company_type"]=="1" ? "公司" :'个人');
+            $v["company_belong"] = ($v["company_belong"]=="0" ? "内团" : ($v["company_belong"]=="1" ? "外团" : ($v["company_belong"]=="2" ? "外团分发" : '无')));
         }
         // dd($companyres);
+        
+     
+        //公司及会长数量统计
+        $companycount = $model->field("id")->where($map)->select();
+        $count = count($companycount);
+        $companyallids = implode(',', array_column($companycount, 'id'));
+        $promotemap['company_id']=["in",$companyallids];
+        $promotecount = M("Promote","tab_")->where($promotemap)->count();
+
+        $this->assign('listData', $companyres);
+        $this->assign('count', $count);
+        $this->assign('promotecount', $promotecount);
         if($is_export){
-            $this->assign('listData', $companyres);
+            //导出
             $this->display("export");
             die();
         }
-        /* 查询记录总数 */
-        $count = $model
-            ->where($map)
-            ->count();
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
@@ -198,9 +209,7 @@ class PromoteCompanyController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-
-        $this->assign('listData', $companyres);
-        $this->assign('count', $count);
+        //分配其他页面需要参数
         $this->assign('promoteList', getPromoteByLevel(1));
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/lists'])->find());
         $this->meta_title = '推广公司';
diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index 4cc3d58f8..6ad7ab8af 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -259,7 +259,7 @@ class StatementMangementController extends ThinkController
                 $item['reward_type_desc'] = $item['reward_type'] == 1 ? "奖励" : "惩罚";
                 $item['company_type_desc'] = $item['company_type'] == 1 ? "上游公司" : "下游公司";
                 $item['relation_game_name'] = $games[$item['relation_game_id']];
-                $item['reward_time'] = date('Y-m-d H:i:s', $item['reward_time']);
+                $item['reward_time'] = $item['reward_time'] ? date('Y-m-d H:i:s', $item['reward_time']) : '-';
                 // if ($item['company_type'] == 1) {
 
                 // } else {
@@ -294,11 +294,19 @@ class StatementMangementController extends ThinkController
             if ($accounts) {
                 
                 foreach ($accounts as $index => $account) {
-                    $data['accounts'][] = array_merge(['account'=>$account], ['user_type'=>$user_types[$index]]);
+
+                    if (checkAccount($user_types[$index],$account)==1) {
+                        $data['accounts'][] = array_merge(['account'=>$account], ['user_type'=>$user_types[$index]]);
+                    } else {
+                        return $this->error('账号'.$account.'不存在，请重新输入');
+                    }
+//                    $data['accounts'][] = array_merge(['account'=>$account], ['user_type'=>$user_types[$index]]);
                 }
             } else {
                 $data['accounts'] = [];
             }
+            $data['accounts']=a_array_unique($data['accounts']);
+//            dump($data['accounts']);die();
             $data['accounts'] = json_encode($data['accounts']);
             if (!is_numeric(I('money'))) {
                 return $this->error('请输入正确的金额');
diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index 5f0957d83..ffda1457e 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -24,7 +24,7 @@ class TestOrderController extends ThinkController
         if (!empty($_REQUEST['server_type'])) {
             $map['server_type'] = $_REQUEST['server_type'];
         }
-        if (!empty($_REQUEST['order_type'])) {
+        if (!empty($_REQUEST['order_type'])||$_REQUEST['order_type'] == '0') {
             $map['order_type'] = $_REQUEST['order_type'];
         }
         if (!empty($_REQUEST['order_no'])) {
diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php
index 37968f32b..6973bfc81 100644
--- a/Application/Admin/Controller/ToolController.class.php
+++ b/Application/Admin/Controller/ToolController.class.php
@@ -16,6 +16,17 @@ class ToolController extends ThinkController {
         $config = I('config');
         $data   = array('config'=>json_encode($config),'template'=>$_POST['template'],'status'=>$_POST['status']);
         $map['name']=$name;
+
+        $day_pay = $config['day_pay_limit'];
+        $month_pay = $config['month_pay_limit'];
+        if(!empty($day_pay) && !empty($month_pay)) {
+            if($month_pay / date('t') > $day_pay) {
+                $this->error('月支付限量较日支付限量过大');
+            } elseif ($month_pay < $day_pay) {
+                $this->error('月支付限量不能小于日支付限量');
+            }
+        }
+
         if($_POST['status']==1&&$name=="weixin"){
             $map_['name']=array("in",'wei_xin,wei_xin_app,weixin_gf');
             M('tool','tab_')->where($map_)->setField('status','0');
diff --git a/Application/Admin/View/FinancialSummary/index.html b/Application/Admin/View/FinancialSummary/index.html
new file mode 100644
index 000000000..a94577f7d
--- /dev/null
+++ b/Application/Admin/View/FinancialSummary/index.html
@@ -0,0 +1,442 @@
+<extend name="Public/base" />
+
+<block name="body">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+    <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
+
+    <style>
+        .select2-container--default .select2-selection--single {
+            color: #000;
+            resize: none;
+            border-width: 1px;
+            border-style: solid;
+            border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+            box-shadow: 0px 3px 3px #F7F8F9 inset;
+            height: 35px;
+            height: 28px;
+            border-radius: 3px;
+            font-size: 12px;
+        }
+
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height: 35px;
+            line-height: 28px;
+        }
+
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            height: 26px;
+        }
+
+        .select2-container--default .select2-search--dropdown .select2-search__field {
+            height: 26px;
+            line-height: 26px;
+            font-size: 12px;
+        }
+
+        .select2-results__option[aria-selected] {
+            font-size: 12px;
+        }
+
+        .tooltip {
+            position: relative;
+            /* display: block; */
+            /* color: #056dae; */
+        }
+
+        .tooltip .tooltiptext {
+            display: none;
+            width: 100%;
+            background-color: #fff;
+            text-align: center;
+            border-radius: 6px;
+            padding: 5px 10px 5px 5px;
+            position: absolute;
+            z-index: 1;
+            bottom: 80%;
+            left: 0;
+            border: #000 solid 1px;
+            line-height: 20px;
+        }
+
+        .tooltip .tooltiptext::after {
+            content: "";
+            position: absolute;
+            top: 100%;
+            left: 50%;
+            margin-left: -5px;
+            border-width: 5px;
+            border-style: solid;
+            border-color: black transparent transparent transparent;
+        }
+
+        .tooltip:hover .tooltiptext {
+            color: #333;
+            display: block;
+
+        }
+    </style>
+    <!-- 标题栏 -->
+    <div class="cf main-place top_nav_list navtab_list">
+
+        <h3 class="page_title">财务汇总统计</h3>
+        <p class="description_text"></p>
+    </div>
+    <style>
+
+
+    </style>
+    <div class="cf top_nav_list">
+        <!-- 高级搜索 -->
+        <div class="jssearch search_list fl cf">
+            <div class="input-list search-title-box">
+                <label>搜索：</label>
+            </div>
+            <div class="input-list input-list-resway search_label_rehab">
+                <select id="year" name="year" class="select_gallery" style="width:150px;">
+                    <volist name="YearList" id="vo">
+                        <option value="{$vo.value}" <if condition="I('year') && $vo.value eq I('year')">selected
+                            </if> >{$vo.name}</option>
+                    </volist>
+                </select>
+            </div>
+            <div class="input-list input-list-resway search_label_rehab">
+                <select id="type" name="type" class="select_gallery" style="width:150px;">
+                    <option value="2" <if condition="I('type') && $vo.value eq 2">selected
+                        </if> >不包含绑币</option>
+                    <option value="3" <if condition="I('type') && $vo.value eq 3">selected
+                        </if> >包含绑币</option>
+                </select>
+            </div>
+            
+            <input type="hidden" name="" value="" class="sortBy">
+            <div class="input-list">
+                <a class="sch-btn" href="javascript:;" id="search"
+                    url="{:U('FinancialSummary/index','model='.$model['name'] .'&row='.I('row'),false)}">
+                    搜索</a>
+            </div>
+
+        </div>
+    </div>
+
+
+    <!-- 数据列表 -->
+    <div class="data_list">
+        <table>
+            <caption class="" style="text-align: left;font-size: 20px;font-weight: 600;">按收入类型</caption>
+            <thead>
+                <tr>
+                    <th>序号</th><th>流水类型</th><th>1月</th><th>2月</th><th>3月</th><th>4月</th><th>5月</th><th>6月</th><th>7月</th><th>8月</th><th>9月</th><th>10月</th><th>11月</th><th>12月</th><th>年度合计</th>
+                </tr>
+            </thead>
+            <tbody>
+                <volist name="data.income.list" id="income" key="incomekey">
+                    <tr>
+                        <td>{$incomekey}</td>
+                        <td>{$income.name}</td>
+                        <volist name="income.money" id="incomemoney" >
+                            <td>{$incomemoney}</td>
+                        </volist>
+                    </tr>
+                </volist>
+                <tr class="data_summary">
+                    <td colspan="2" style="text-align: center;">合计:</td>
+                    <volist name="data.income.count" id="incomecount" >
+                        <td>{$incomecount}</td>
+                    </volist>
+                </tr>
+            </tbody>
+        </table>
+        <table style="margin-top: 30px;">
+            <caption class="" style="text-align: left;font-size: 20px;font-weight: 600;">按合作方类型</caption>
+            <thead>
+                <tr>
+                    <th>序号</th><th>流水类型</th><th>1月</th><th>2月</th><th>3月</th><th>4月</th><th>5月</th><th>6月</th><th>7月</th><th>8月</th><th>9月</th><th>10月</th><th>11月</th><th>12月</th><th>年度合计</th>
+                </tr>
+            </thead>
+            <tbody>
+                <volist name="data.promote.list" id="promote" key="promotekey">
+                    <tr>
+                        <td>{$promotekey}</td>
+                        <td>{$promote.name}</td>
+                        <volist name="promote.money" id="promotemoney" >
+                            <td>{$promotemoney}</td>
+                        </volist>
+                    </tr>
+                </volist>
+                <tr class="data_summary">
+                    <td colspan="2" style="text-align: center;">合计:</td>
+                    <volist name="data.promote.count" id="promotecount" >
+                        <td>{$promotecount}</td>
+                    </volist>
+                </tr>
+            </tbody>
+        </table>
+        <table style="margin-top: 30px;">
+            <caption class="" style="text-align: left;font-size: 20px;font-weight: 600;">按支付渠道类型</caption>
+            <thead>
+                <tr>
+                    <th>序号</th><th>流水类型</th><th>1月</th><th>2月</th><th>3月</th><th>4月</th><th>5月</th><th>6月</th><th>7月</th><th>8月</th><th>9月</th><th>10月</th><th>11月</th><th>12月</th><th>年度合计</th>
+                </tr>
+            </thead>
+            <tbody>
+                <volist name="data.channel.list" id="channel" key="channelkey">
+                    <tr>
+                        <td>{$channelkey}</td>
+                        <td>{$channel.name}</td>
+                        <volist name="channel.money" id="channelmoney" >
+                            <td>{$channelmoney}</td>
+                        </volist>
+                    </tr>
+                </volist>
+                <tr class="data_summary">
+                    <td colspan="2" style="text-align: center;">合计:</td>
+                    <volist name="data.channel.count" id="channelcount" >
+                        <td>{$channelcount}</td>
+                    </volist>
+                </tr>
+            </tbody>
+        </table>
+        <table style="margin-top: 30px;">
+            <caption class="" style="text-align: left;font-size: 20px;font-weight: 600;">支付类型类型</caption>
+            <thead>
+                <tr>
+                    <th>序号</th><th>流水类型</th><th>1月</th><th>2月</th><th>3月</th><th>4月</th><th>5月</th><th>6月</th><th>7月</th><th>8月</th><th>9月</th><th>10月</th><th>11月</th><th>12月</th><th>年度合计</th>
+                </tr>
+            </thead>
+            <tbody>
+                <volist name="data.payway.list" id="payway" key="paywaykey">
+                    <tr>
+                        <td>{$paywaykey}</td>
+                        <td>{$payway.name}</td>
+                        <volist name="payway.money" id="paywaymoney" >
+                            <td>{$paywaymoney}</td>
+                        </volist>
+                    </tr>
+                </volist>
+                <tr class="data_summary">
+                    <td colspan="2" style="text-align: center;">合计:</td>
+                    <volist name="data.payway.count" id="paywaycount" >
+                        <td>{$paywaycount}</td>
+                    </volist>
+                </tr>
+            </tbody>
+        </table>
+        <div style="width: 100%;height: 50px;"></div>
+    </div>
+
+</block>
+
+<block name="script">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <php>if(C('COLOR_STYLE')=='blue_color') echo '
+        <link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
+        charset="UTF-8"></script>
+    <script type="text/javascript">
+    </script>
+    <script type="text/javascript">
+
+        //导航高亮
+        highlight_subnav('{:U("FinancialSummary/index")}');
+        $(function () {
+            <volist name=":I('get.')" id="vo">
+                Think.setValue('{$key}',"{$vo}");
+    </volist>
+        });
+    </script>
+    <script type="text/javascript">
+        $(function () {
+            $(".coin-detail").click(function () {
+                var pay_type = $(this).data('pay_type');
+                var url = $(this).data('url');
+                var title = pay_type == -1 ? '内充支出明细' :(pay_type == 0 ? '平台币直充明细': '平台币内充明细');
+                layer.open({
+                    type: 2,
+                    title: title,
+                    shadeClose: true,
+                    shade: 0.8,
+                    area: ['70%', '80%'],
+                    content: url
+                });
+            });
+            $(".select_gallery").select2();
+            //搜索功能
+            $("#search").click(function () {
+                var url = $(this).attr('url');
+                var query = $('.jssearch').find('input').serialize();
+                query += "&" + $('.jssearch').find('select').serialize();
+                query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+                query = query.replace(/^&/g, '');
+                if (url.indexOf('?') > 0) {
+                    url += '&' + query;
+                } else {
+                    url += '?' + query;
+                }
+                var start = $("#time_start").val();
+                var end = $("#time_end").val();
+                if (start != '' && end != '') {
+                    if (Date.parse(start) > Date.parse(end)) {
+                        layer.msg('开始时间必须小于等于结束时间');
+                        return false;
+                    }
+                }
+                window.location.href = url;
+            });
+            $(".paixu").click(function () {
+                var that = $(this);
+                $data_order = that.attr('data-order');
+                $order_type = '{$userarpu_order}';
+                if ($order_type == '' || $order_type == '4') {
+                    $(".sortBy").attr('name', 'data_order');
+                    val = '3,' + $data_order;
+                    $(".sortBy").attr('value', val);
+                    $("#search").click();
+                } else if ($order_type == '3') {
+                    $(".sortBy").attr('name', 'data_order');
+                    val = '4,' + $data_order;
+                    $(".sortBy").attr('value', val);
+                    $("#search").click();
+                }
+            });
+
+            $('.jssamlllist').click(function () {
+                var that = $(this), url = that.attr('data-url');
+                var url =
+                    layer.open({
+                        type: 2,
+                        title: "【" + that.attr('data-account') + "】小号列表",
+                        shadeClose: true,
+                        shade: 0.8,
+                        area: ['1062px', '80%'],
+                        content: url,//iframe的url
+                    });
+
+                return false;
+            });
+
+            $(".paixu").click(function () {
+                var val = $(this).attr('data-order');
+                if (val == 1) {
+                    val = 2;
+                } else if (val == 2) {
+                    val = 1;
+                }
+                var name = $(this).attr('name');
+                if (name == 'balance_status') {
+                    $('#key').val(1);
+                } else {
+                    $('#key').val(2);
+                }
+                $("#" + name).val(val);
+                $("#search").click();
+            });
+            //回车自动提交
+            $('.jssearch').find('input').keyup(function (event) {
+                if (event.keyCode === 13) {
+                    $("#search").click();
+                }
+            });
+
+            $("#total_status").click(function () {
+                $("#search").click();
+            })
+
+
+            $('#time_start').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true
+            });
+
+            $('#datetimepicker').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true,
+                pickerPosition: 'bottom-left'
+            })
+            
+            var promote_id = "{:I('promote_id')}";
+            var company_id = "{:I('company_id')}";
+            function getPromotersByCompanyid() {
+                var company_id = $("#company_id option:selected").val();
+                if(!company_id){
+                    company_id = -1;
+                }
+                $.ajax({
+                    url: "{:U('Ajax/getPromotersByCompanyid')}",
+                    type: "get",
+                    data: { company_id:company_id},
+                    dataType: 'json',
+                    success: function (response) {
+                        str = '<option value="">请选择会长</option>';
+                        if(company_id == 0 || company_id ==-1){
+                            str +='<option value="0"' + (promote_id && 0 == promote_id ? 'selected' : '') + '>官方渠道</option>';
+                        }
+                        data = response.data;
+                        for (var i in data) {
+                            str += "<option value='" + data[i].id + "' " + (promote_id && data[i].id == promote_id ? 'selected' : '') + ">" + data[i].nickname + "</option>"
+                        }
+                        $("#promote_id").empty();
+                        $("#promote_id").append(str);
+                        $("#promote_id").select2();
+                    }
+                })
+            }
+            getPromotersByCompanyid();
+
+            $("#company_id").change(function(){
+                getPromotersByCompanyid();
+            })
+        })
+
+
+        function shenhe(status) {
+            var text = $("input:checkbox[name='ids[]']:checked").map(function (index, elem) {
+                return $(elem).val();
+            }).get().join("\n");
+            var desc = '';
+            if (status == 0) {
+                desc = '锁定';
+            } else {
+                desc = '开启';
+            }
+            layer.prompt({
+                formType: 2,
+                value: text,
+                placeholder: '玩家账号（一个账号一行）',
+                title: '请输入要' + desc + '的玩家账号（一个账号一行）',
+                area: ['800px', '350px'] //自定义文本域宽高
+            }, function (value, index, elem) {
+                if (value == '') {
+                    layer.msg("请输入账户ID");
+                    return;
+                }
+
+                $.ajax({
+                    cache: true,
+                    type: "POST",
+                    url: "{:U('Member/lock_status')}",
+                    data: { accounts: value, lock_status: status },// 你的formid
+                    async: false,
+                    error: function (data) {
+                        layer.alert("服务器故障，请稍后重试！", { icon: 2 });
+                    },
+                    success: function (data) {
+                        // var obj = JSON.parse(data);
+                        // layer.alert(obj.info,{icon:obj.status})
+                        layer.alert(data.info, { icon: data.status })
+                        window.location.reload()
+                    }
+                });
+                layer.close(index);
+            });
+        }
+    </script>
+
+</block>
\ No newline at end of file
diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html
index f5c1eee72..596e41090 100644
--- a/Application/Admin/View/Partner/add.html
+++ b/Application/Admin/View/Partner/add.html
@@ -61,7 +61,7 @@
                         <tr>
                             <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="invoice_rate" value="" placeholder="请输入开票税点">
+                                <input type="text" class="txt " name="invoice_rate" value="" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
                         </tr>
 
@@ -186,7 +186,7 @@
                         <tr>
                             <td class="l noticeinfo">文档管理</td>
                             <td class="r table_radio">
-                                <input type="button" class="coin-detail" data-url="{:U('Partner/addfile')}" value="添加"
+                                <input type="button" class="coin-detail" data-url="{:U('Ajax/addfile')}" value="添加"
                                        style="border-radius:5%;background: #fff;color: #333;font-weight: 400;border: 1px solid #777;width: 100px;height: 35px">
                             </td>
                         </tr>
@@ -244,9 +244,10 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script type="text/javascript">
         $('.time1').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var start = new Date($(this).val()).getTime();
@@ -260,9 +261,10 @@
         });
 
         $('.time2').datetimepicker({
-            format: 'yyyy-mm-dd hh:ii',
+            format: 'yyyy-mm-dd',
             language:"zh-CN",
-            minView:0,startDate:new Date(),
+            minView: "month",
+            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var end = new Date($(this).val()).getTime();
@@ -350,7 +352,7 @@
                     console.log(index);
                     var id = 0;
                     $.ajax({
-                        url:"{:U('Partner/delFile')}",
+                        url:"{:U('Ajax/delFile')}",
                         type:"post",
                         data:{
                             "id":0,
diff --git a/Application/Admin/View/Partner/addfile.html b/Application/Admin/View/Partner/addfile.html
index 04a58ea90..26719bb19 100644
--- a/Application/Admin/View/Partner/addfile.html
+++ b/Application/Admin/View/Partner/addfile.html
@@ -58,7 +58,7 @@
             formData.append("file", document.getElementById("fileinput").files[0]);
             var index = layer.load();
             $.ajax({
-                url:"{:U('Partner/saveFile')}",
+                url:"{:U('Ajax/saveFile')}",
                 type:"post",
                 data:formData,
                 processData:false,
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index f0b4f5915..b3305d050 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -61,7 +61,7 @@
                         <tr>
                             <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="invoice_rate" value="{$data.invoice_rate}" placeholder="请输入开票税点">
+                                <input type="text" class="txt " name="invoice_rate" value="{$data.invoice_rate}" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
                         </tr>
 
@@ -186,7 +186,7 @@
                         <tr>
                             <td class="l noticeinfo">文档管理</td>
                             <td class="r table_radio">
-                                <input type="button" class="coin-detail" data-url="{:U('Partner/addfile')}" value="添加"
+                                <input type="button" class="coin-detail" data-url="{:U('Ajax/addfile')}" value="添加"
                                        style="border-radius:5%;background: #fff;color: #333;font-weight: 400;border: 1px solid #777;width: 100px;height: 35px">
                             </td>
                         </tr>
@@ -359,7 +359,7 @@
                     console.log(index);
                     var id = 0;
                     $.ajax({
-                        url:"{:U('Partner/delFile')}",
+                        url:"{:U('Ajax/delFile')}",
                         type:"post",
                         data:{
                             "id":0,
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index 73ed574a6..a7cb8fdfe 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -90,6 +90,7 @@
                 <tr>
                     <th style="width:8%;min-width:10px;">操作</th>
                     <th>合同合作方名称</th>
+                    <th>公司性质</th>
                     <th>对应平台</th>
                     <th>合同期限</th>
                     <th>开票税点</th>
@@ -105,6 +106,7 @@
                     <th>原包名</th>
                     <th>现包名</th>
                     <th colspan="2">合作方分成比例</th>
+<!--                    <th colspan="2">我方分成比例</th>-->
 
                 </tr>
                 </thead>
@@ -122,6 +124,7 @@
                                 <a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
                             </td>
                             <td rowspan="{$data.row}">{$data.partner}</td>
+                            <td rowspan="{$data.row}">{$data.company_type}</td>
                             <td rowspan="{$data.row}">{$data.matche_platform}</td>
                             <td rowspan="{$data.row}">{$data.contract_time}</td>
                             <td rowspan="{$data.row}">{$data.invoice_rate}%</td>
@@ -146,17 +149,25 @@
                                                         <tr>
                                                             <td>{$ratio['name']}</td>
                                                             <td>{$ratio['ratio']}</td>
+<!--                                                            <td>{$ratio['name']}</td>-->
+<!--                                                            <td>{$ratio['my_ratio']}</td>-->
                                                         </tr>
                                                         <else />
                                                         <td>{$ratio['name']}</td>
                                                         <td>{$ratio['ratio']}</td>
+<!--                                                        <td>{$ratio['name']}</td>-->
+<!--                                                        <td>{$ratio['my_ratio']}</td>-->
                                                     </if>
                                                 </foreach>
         
                                                 <else />
                                                 <td >-</td>
                                                 <td>-</td>
+<!--                                                <td>-</td>-->
+<!--                                                <td>-</td>-->
                                             </notempty>
+
+
                                         </tr>
                                     <else />
                                     <td rowspan="{$game.row}">{$game['game_type_name']}</td>
@@ -169,18 +180,25 @@
                                                 <tr>
                                                     <td>{$ratio['name']}</td>
                                                     <td>{$ratio['ratio']}</td>
+<!--                                                    <td>{$ratio['name']}</td>-->
+<!--                                                    <td>{$ratio['my_ratio']}</td>-->
                                                 </tr>
                                                 <else />
                                                 <td>{$ratio['name']}</td>
                                                 <td>{$ratio['ratio']}</td>
+<!--                                                <td>{$ratio['name']}</td>-->
+<!--                                                <td>{$ratio['my_ratio']}</td>-->
                                             </if>
                                         </foreach>
 
                                         <else />
                                         <td >-</td>
                                         <td>-</td>
+<!--                                        <td>-</td>-->
+<!--                                        <td>-</td>-->
                                     </notempty>
 
+
                                     </if>
                         </foreach>
                         <else />
@@ -189,6 +207,8 @@
                         <td rowspan="{$data.row}">-</td>
                         <td rowspan="{$data.row}">-</td>
                         <td rowspan="{$data.row}">-</td>
+<!--                        <td rowspan="{$data.row}">-</td>-->
+<!--                        <td rowspan="{$data.row}">-</td>-->
                     </notempty>
 
                         </tr>
@@ -244,7 +264,17 @@
     $(function(){
         $("#downloadexcel").on("click",function(){
             var url = $(this).attr("url");
-            window.open(url, "blank");
+            var title =  '合作方导出';
+            layer.open({
+                type: 2,
+                title: title,
+                shadeClose: true,
+                shade: 0,
+                area: ['40%', '60%'],
+                content: url,
+                zIndex :-5
+            });
+            // window.open(url, "blank");
         });
         $('#time-start').datetimepicker({
             format: 'yyyy-mm-dd',
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index ffc13bd40..5492ed73b 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -61,7 +61,7 @@
                         <tr>
                             <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="inoice_rate" value="{$data.inoice_rate}" placeholder="请输入开票税点" readonly>
+                                <input type="text" class="txt " name="inoice_rate" value="{$data.inoice_rate}" placeholder="请输入开票税点" readonly><span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
                         </tr>
 
diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index d358bf1af..7232a461c 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -29,48 +29,67 @@
     <table border="1" id="exporttable" style="opacity: 0;">
         <!-- 表头 -->
         <thead>
-        <tr>
-            <th>合作方名称</th>
-            <th>对应平台</th>
-            <th>合同期限</th>
-            <th>开票税点</th>
-            <th>开户行</th>
-            <th>银行账号</th>
-            <th>是否签署合同</th>
-            <th>备注</th>
+            <tr>
+                <th>合作方名称</th>
+                <th>对应平台</th>
+                <th>公司性质</th>
+                <th>内外团归属</th>
+                <th>合同期限</th>
+                <th>开票税点</th>
+                <th>开户行</th>
+                <th>银行账号</th>
+                <th>是否签署合同</th>
+                <th>备注</th>
 
-            <th>会长账号</th>
-            <th>结算周期</th>
-            <th>产品类型</th>
-            <th>游戏名称</th>
-            <th colspan="2">合作方分成比例</th>
-        </tr>
-        </thead>
+                <th>会长账号</th>
+                <th>结算周期</th>
+                <th>产品类型</th>
+                <th>游戏名称</th>
+                <th colspan="2">合作方分成比例</th>
+            </tr>
+            </thead>
 
-        <!-- 列表 -->
-        <tbody>
-        <empty name ="listData">
-            <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
-            <else />
-            <volist name="listData" id="data" key="companykey">
-                <tr>
-                    <td rowspan="{$data.row}">{$data.company_name}</td>
-                    <td rowspan="{$data.row}">{$data.platform_name}</td>
-                    <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
-                    <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
-                    <td rowspan="{$data.row}">{$data.bank_name}</td>
-                    <td rowspan="{$data.row}">&nbsp;{$data.bank_card}</td>
-                    <td rowspan="{$data.row}">{$data.is_sign_contact}</td>
-                    <td rowspan="{$data.row}">{$data.content}</td>
-                    <notempty name="data.list">
-                        <foreach name="data['list']" item="promote" key="promotekey">
-                            <if condition="$promotekey gt 0">
-                                <tr>
-                                    <td rowspan="{$promote['row']}"> {$promote['account']}</td>
-                                    <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
-                                    <foreach name="promote['list']" item="game" key="gamekey">
-                                        <if condition="$gamekey gt 0">
-                                            <tr>
+            <!-- 列表 -->
+            <tbody>
+            <empty name ="listData">
+                <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
+                <else />
+                <volist name="listData" id="data" key="companykey">
+                    <tr>
+                        <td rowspan="{$data.row}">{$data.company_name}</td>
+                        <td rowspan="{$data.row}">{$data.platform_name}</td>
+                        <td rowspan="{$data.row}">{$data.company_type}</td>
+                        <td rowspan="{$data.row}">{$data.company_belong}</td>
+                        <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
+                        <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
+                        <td rowspan="{$data.row}">{$data.bank_name}</td>
+                        <td rowspan="{$data.row}">&nbsp;{$data.bank_card}</td>
+                        <td rowspan="{$data.row}">{$data.is_sign_contact}</td>
+                        <td rowspan="{$data.row}">{$data.content}</td>
+                        <notempty name="data.list">
+                            <foreach name="data['list']" item="promote" key="promotekey">
+                                <if condition="$promotekey gt 0">
+                                    <tr>
+                                        <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
+                                        <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
+                                        <foreach name="promote['list']" item="game" key="gamekey">
+                                            <if condition="$gamekey gt 0">
+                                                <tr>
+                                                    <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
+                                                    <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
+                                                    <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
+                                                        <if condition="$ratiokey gt 0">
+                                                            <tr>
+                                                                <td>{$ratio['name']}</td>
+                                                                <td>{$ratio['ratio']}</td>
+                                                            </tr>
+                                                        <else />
+                                                            <td>{$ratio['name']}</td>
+                                                            <td>{$ratio['ratio']}</td>
+                                                        </if>
+                                                    </foreach>
+                                                </tr>
+                                            <else />
                                                 <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
                                                 <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
                                                 <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
@@ -84,44 +103,14 @@
                                                         <td>{$ratio['ratio']}</td>
                                                     </if>
                                                 </foreach>
-                                            </tr>
-                                        <else />
-                                            <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                            <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                            <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                                <if condition="$ratiokey gt 0">
-                                                    <tr>
-                                                        <td>{$ratio['name']}</td>
-                                                        <td>{$ratio['ratio']}</td>
-                                                    </tr>
-                                                <else />
-                                                    <td>{$ratio['name']}</td>
-                                                    <td>{$ratio['ratio']}</td>
-                                                </if>
-                                            </foreach>
-                                        </if>
-                                    </foreach>
-                                </tr>
-                            <else />
-                                <td rowspan="{$promote['row']}"> {$promote['account']}</td>
-                                <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
-                                <foreach name="promote['list']" item="game" key="gamekey">
-                                    <if condition="$gamekey eq 0">
-                                        <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                        <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                        <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                            <if condition="$ratiokey gt 0">
-                                                <tr>
-                                                    <td>{$ratio['name']}</td>
-                                                    <td>{$ratio['ratio']}</td>
-                                                </tr>
-                                            <else />
-                                                <td>{$ratio['name']}</td>
-                                                <td>{$ratio['ratio']}</td>
                                             </if>
-                                        </foreach> 
-                                    <else />
-                                        <tr>
+                                        </foreach>
+                                    </tr>
+                                <else />
+                                    <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
+                                    <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
+                                    <foreach name="promote['list']" item="game" key="gamekey">
+                                        <if condition="$gamekey eq 0">
                                             <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
                                             <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
                                             <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
@@ -135,16 +124,37 @@
                                                     <td>{$ratio['ratio']}</td>
                                                 </if>
                                             </foreach> 
-                                        </tr>
-                                    </if>
-                                </foreach>
-                            </if>
-                        </foreach>
-                    </notempty>
+                                        <else />
+                                            <tr>
+                                                <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
+                                                <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
+                                                <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
+                                                    <if condition="$ratiokey gt 0">
+                                                        <tr>
+                                                            <td>{$ratio['name']}</td>
+                                                            <td>{$ratio['ratio']}</td>
+                                                        </tr>
+                                                    <else />
+                                                        <td>{$ratio['name']}</td>
+                                                        <td>{$ratio['ratio']}</td>
+                                                    </if>
+                                                </foreach> 
+                                            </tr>
+                                        </if>
+                                    </foreach>
+                                </if>
+                            </foreach>
+                        </notempty>
+                    </tr>
+                </volist>
+                <tr class="data_summary">
+                    <td style="text-align: center;">汇总:</td>
+                    <td colspan="15">
+                        累计推广公司数量：{$count}&#12288;&#12288;会长数量:{$promotecount}
+                    </td>
                 </tr>
-            </volist>
-        </empty>
-        </tbody>
+            </empty>
+            </tbody>
     </table>
 
 <script>
diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index 65e229118..5f547a413 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -93,6 +93,8 @@
                     <th style="width:10%;min-width:150px;">操作</th>
                     <th>合作方名称</th>
                     <th>对应平台</th>
+                    <th>公司性质</th>
+                    <th>内外团归属</th>
                     <th>合同期限</th>
                     <th>开票税点</th>
                     <th>开户行</th>
@@ -122,6 +124,8 @@
                             </td>
                             <td rowspan="{$data.row}">{$data.company_name}</td>
                             <td rowspan="{$data.row}">{$data.platform_name}</td>
+                            <td rowspan="{$data.row}">{$data.company_type}</td>
+                            <td rowspan="{$data.row}">{$data.company_belong}</td>
                             <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
                             <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
                             <td rowspan="{$data.row}">{$data.bank_name}</td>
@@ -209,6 +213,12 @@
                             </notempty>
                         </tr>
                     </volist>
+                    <tr class="data_summary">
+                        <td style="text-align: center;">汇总:</td>
+                        <td colspan="16">
+                            累计推广公司数量：{$count}&#12288;&#12288;会长数量:{$promotecount}
+                        </td>
+                    </tr>
                 </empty>
                 </tbody>
             </table>
diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html
index 064f94ca5..43eebf417 100644
--- a/Application/Admin/View/StatementMangement/rewardManageList.html
+++ b/Application/Admin/View/StatementMangement/rewardManageList.html
@@ -77,7 +77,7 @@
                 <select id="partner_id" name="partner_id" class="select_gallery"  style="width:120px;">
                     <option value="">请选择合作公司</option>
                     <volist name=":getPartner()" id="vo">
-                        <option partner-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $_GET['partner_id']">selected=selected</if>>{$vo.partner}</option>
+                        <option partner-id="{$vo.id}" value="{$vo.id}" data-type="{$vo.type}" <if condition="$vo.id eq $_GET['partner_id']">selected=selected</if>>{$vo.partner}</option>
                     </volist>
                 </select>
             </div>
@@ -153,7 +153,7 @@
                                 <td>{$data.content}</td>
                                 <td>{$data.money}</td>
                                 <td>{$data.remark}</td>
-                                <td>{:date('Y-m-d H:i:s',$data['reward_time'])}</td>
+                                <td>{$data['reward_time']}</td>
                                 <td>{:get_admin_nickname($data['creater_id'])}</td>
                                 <td>
                                     <a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>
@@ -201,6 +201,31 @@
         $(".select_gallery").select2();
         highlight_subnav("{:U('StatementMangement/rewardManageList')}");
 
+        function get_company_list()
+        {
+            var id = $('#partner_id').val();
+            var company_type = $("#company_type option:selected").val();
+            $.ajax({
+                url:"{:U('Ajax/getCompanyList')}",
+                type:"post",
+                data:{
+                    company_type:company_type,
+                },
+                dataType:'json',
+                success:function(data){
+                    var str = "<option value=''>请选择合作公司</option>";
+                    for (var i in data){
+                        str += "<option value='"+data[i].id+"'"+"data-type='"+data[i].type+"'"+(id && data[i].id == id?'selected':'')+">"+data[i].name+"</option>"
+                    }
+                    // console.log(str);
+                    $("#partner_id").empty();
+                    $("#partner_id").append(str);
+                    $("#partner_id").select2();
+
+                }
+            })
+        }
+
         function get_game_list()
         {
             var game_name = $('#game_name').val();
@@ -228,9 +253,13 @@
             })
         }
         $(function(){
+            get_company_list();
             $("#partner_id").change(function(){
                 get_game_list();
             });
+            $("#company_type").change(function(){
+                get_company_list();
+            });
             //搜索功能
             $("#search").click(function(){
                 var url = $(this).attr('url');
diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
index 7c86ec66b..f36b33eff 100644
--- a/Application/Admin/View/StatementMangement/rewardManageSave.html
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -25,7 +25,7 @@
     </style>
     <style>
         .select2-container--default .select2-selection--single {
-                color: #000;
+            color: #000;
             resize: none;
             border-width: 1px;
             border-style: solid;
@@ -41,7 +41,7 @@
             height:26px;
         }
         .select2-container--default .select2-search--dropdown .select2-search__field {
-          height:26px;line-height:26px;font-size:12px;
+            height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
     </style>
@@ -62,22 +62,28 @@
             charset="UTF-8"></script>
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
-            class="form-horizontal form_info_ml" id="form">
-        <div class="formtitle"><span>奖惩编辑</span></div>
+          class="form-horizontal form_info_ml" id="form">
+        <div class="formtitle"><span>奖惩<?php if ($_GET['id']):?>编辑 <?php else:?>新增<?php endif;?></span></div>
         <ul class="form_info ">
             <input type="hidden" name="id" value="{$data.id}" />
             <li>
                 <label>奖惩类型</label>
-                <select id="reward_type" name="reward_type" class="select_gallery">
-                    <option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
-                    <option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
+                <?php if ($_GET['id']):?>
+                <input type="hidden" name="reward_type" value="{$data['reward_type']}">
+                <?php endif;?>
+                <select id="reward_type" name="reward_type" class="select_gallery" <?php if ($_GET['id']):?> disabled<?php endif;?>>
+                <option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
+                <option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
                 </select>
             </li>
             <li>
                 <label>公司类型</label>
-                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()">
-                    <option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
-                    <option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
+                <?php if ($_GET['id']):?>
+                <input type="hidden" name="company_type" value="{$data['company_type']}">
+                <?php endif;?>
+                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()" <?php if ($_GET['id']):?> disabled<?php endif;?>>
+                <option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
+                <option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
                 </select>
             </li>
             <li>
@@ -93,22 +99,22 @@
             <?php foreach ($data['accounts'] as $k => $account):?>
             <?php if ($k == 0):?>
             <li class="user-account">
-                    <label>涉及账号</label>
-                    <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
+                <label>涉及账号</label>
+                <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
                     <option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
                     <option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
-                    </select>
-                    <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
-                    <button type="button" class="bnt_add">✚</button>
+                </select>
+                <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
+                <button type="button" class="bnt_add">✚</button>
             </li>
             <?php else:?>
             <li class="user-account">
-                    <label>涉及账号</label>
-                    <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
+                <label>涉及账号</label>
+                <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
                     <option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
                     <option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
-                    </select>
-                    <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
+                </select>
+                <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
                 <button type="button" class="bnt_remove">✖</button>
             </li>
             <?php endif;?>
@@ -149,76 +155,76 @@
                 <button class="submit_btn ajax-post" id="submit" type="submit" target-form="form-horizontal">
                     确认保存
                 </button>
-                <input type="button"  value="返 回" target-form="form-horizontal" class="form_btn ajax-post" onclick="javascript:void(window.history.go(-1))">
+                <input type="button"  value="返 回" target-form="form-horizontal" class="form_btn" onclick="javascript:void(window.history.go(-1))">
             </li>
         </ul>
     </form>
-		
-		<div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$m_title}">
-				<input type="hidden" name="url" value="AuthManager/index">
-			</form>
-			<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-		</div>
-		
+
+    <div class="common_settings">
+        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+        <form class="addShortcutIcon">
+            <input type="hidden" name="title" value="{$m_title}">
+            <input type="hidden" name="url" value="AuthManager/index">
+        </form>
+        <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
+    </div>
+
 </block>
 <block name="script">
     <script type="text/javascript">
-    highlight_subnav('{:U('StatementMangement/rewardManageList')}');
-    $(".bnt_add").bind("click",function(){
+        highlight_subnav('{:U('StatementMangement/rewardManageList')}');
+        $(".bnt_add").bind("click",function(){
             var a=  '<li class="user-account"><label>涉及账号</label><select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)"><option value="1">推广员</option><option value="2">玩家</option></select><input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号"><button type="button" class="bnt_remove">✖</button>';
             $(".user-account:last").after(a);
         });
-    $(document).on('click', '.bnt_remove', function(){
-        $(this).parents('li').remove();
-    });
-    var date = new Date();
-    var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
-    $("#reward_time").datetimepicker({
-        format : "yyyy-mm-dd hh:ii",
-        autoclose : true,
-        todayBtn : true,
-        todayHighlight : true,
-        startDate : monthStart,
-        language : 'zh-CN',
-        startView : 2,//月视图
-        showMeridian : true,
-        pickerPosition : "bottom-left",
-        minuteStep : 5
-    });
-
-    /* $('#reward_time').datetimepicker({
-        language:"zh-CN",
-        hour: 13,
-        minute: 15,
-        setStartDate:'2020-02-01',
-        todayHighlight : true,
-        todayBtn:true
-    });*/
-    var company_id = '{$data["company_id"]}';
-    function companyTypeChange()
-    {
-        var companyType = $('#company_type').val();
-        $.ajax({
-            url:"{:U('StatementMangement/getCompanys')}",
-            dataType:'JSON',
-            data: {'type':companyType},
-            success:function(response){
-                var companyData = '';
-                $.each(response.info, function(index, item){
-                    if (company_id == item.id) {
-                        companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
-                    } else {
-                        companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
-                    }
-                });
-                $('#company_id').html(companyData);
-            }
+        $(document).on('click', '.bnt_remove', function(){
+            $(this).parents('li').remove();
         });
-    }
+        var date = new Date();
+        var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
+        $("#reward_time").datetimepicker({
+            format : "yyyy-mm-dd hh:ii",
+            autoclose : true,
+            todayBtn : true,
+            todayHighlight : true,
+            startDate : monthStart,
+            language : 'zh-CN',
+            startView : 2,//月视图
+            showMeridian : true,
+            pickerPosition : "bottom-left",
+            minuteStep : 5
+        });
+
+        /* $('#reward_time').datetimepicker({
+            language:"zh-CN",
+            hour: 13,
+            minute: 15,
+            setStartDate:'2020-02-01',
+            todayHighlight : true,
+            todayBtn:true
+        });*/
+        var company_id = '{$data["company_id"]}';
+        function companyTypeChange()
+        {
+            var companyType = $('#company_type').val();
+            $.ajax({
+                url:"{:U('StatementMangement/getCompanys')}",
+                dataType:'JSON',
+                data: {'type':companyType},
+                success:function(response){
+                    var companyData = '';
+                    $.each(response.info, function(index, item){
+                        if (company_id == item.id) {
+                            companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
+                        } else {
+                            companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
+                        }
+                    });
+                    $('#company_id').html(companyData);
+                }
+            });
+        }
 
-    companyTypeChange();
+        companyTypeChange();
     </script>
 </block>
\ No newline at end of file
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index 6b12f90f8..d54ff84ba 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -192,6 +192,16 @@
   <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+  <script type="text/javascript">
+
+    //导航高亮
+    highlight_subnav('{:U("TestOrder/lists")}');
+    $(function () {
+    <volist name=":I('get.')" id="vo">
+        Think.setValue('{$key}',"{$vo}");
+    </volist>
+    });
+  </script>
   <script type="text/javascript">
     $(".select_gallery").select2();
     function reload() {
diff --git a/Application/Admin/View/Tool/company_info.html b/Application/Admin/View/Tool/company_info.html
index 2344597a5..d8a5f39d0 100644
--- a/Application/Admin/View/Tool/company_info.html
+++ b/Application/Admin/View/Tool/company_info.html
@@ -157,7 +157,7 @@
 </script>
 <script type="text/javascript">
     //导航高亮
-    highlight_subnav("{:U('lists')}");
+    highlight_subnav("{:U('Tool/company_info')}");
     $(function(){
         //搜索功能
         $("#search").click(function(){
diff --git a/Application/Admin/View/Tool/payset.html b/Application/Admin/View/Tool/payset.html
index 803572aa8..352ea0fd4 100644
--- a/Application/Admin/View/Tool/payset.html
+++ b/Application/Admin/View/Tool/payset.html
@@ -243,6 +243,33 @@
 								<span class="notice-text">控制SDK内的支付宝支付方式，默认是APP支付，当选择WAP支付时，在SDK支付页面选择“支付宝”进行付款时，采用支付宝的WAP支付</span>
 							</td>
 						</tr>
+                        <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$alipay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$alipay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
 						
 						<tr>
 
@@ -348,6 +375,36 @@
 
             </tr>
 
+
+            <tr>
+
+                <td class="l noticeinfo">日支付限量</td>
+
+                <td class="r table_radio">
+
+                    <input name="config[day_pay_limit]" type="text" value="{$wei_xin['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                    <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                </td>
+
+            </tr>
+
+            <tr>
+
+                <td class="l noticeinfo">月支付限量</td>
+
+                <td class="r table_radio">
+
+                    <input name="config[month_pay_limit]" type="text" value="{$wei_xin['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                    <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                </td>
+
+            </tr>
+
+
             <tr>
 
                 <td class="l noticeinfo">启用状态</td>
@@ -453,6 +510,8 @@
 
             </tr>
 
+
+
             <tr>
 
                 <td class="l noticeinfo">启用状态</td>
@@ -1363,7 +1422,33 @@
                         </td>
                     </tr>
                     
-                    
+                    <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$sqpay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$sqpay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
                    
                     <tr>
 
@@ -1467,6 +1552,34 @@
                     </tr>
 
 
+                    <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$heepay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$heepay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
                     <tr>
 
                         <td class="l noticeinfo">启用状态</td>
diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index dc8be7cc6..6595b95ab 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -1015,7 +1015,7 @@ class PromoteService {
             if (!$record) {
                 return false;
             }
-            if ($record['status'] != 1) {
+            if (!in_array($record['status'], [1, 2])) {
                 return false;
             }
         }
diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php
index ed99d068b..c7cf38695 100644
--- a/Application/Home/Controller/ApplyController.class.php
+++ b/Application/Home/Controller/ApplyController.class.php
@@ -132,6 +132,15 @@ class ApplyController extends BaseController
                     }
                 }
                 break;
+            case 0:
+                $applyService = new ApplyService();
+                $gameIdList = $applyService->getSociatyGameIds($loginPromote);
+                if (count($gameIdList) > 0) {
+                    $gameIds = implode(',', $gameIdList);
+                    $map['tab_game.id'] = ['in', $gameIds];
+                } else {
+                    $map = '1 = 2';
+                }
         }
 
         $page = intval(I('get.p', 0));
@@ -615,8 +624,13 @@ class ApplyController extends BaseController
             $promoteId = $_REQUEST['promote_id'];
         }
 
+        $applyService = new ApplyService();
+        $gameIdList = $applyService->getSociatyGameIds($loginPromote);
+
         $applyMap['promote_id'] = $promoteId;
         $applyMap['offline_status'] = 0;
+        $applyMap['game_id'] = ['in', $gameIdList];
+
         $gameIds = M('Apply', 'tab_')->where($applyMap)->getField('game_id', true);
         $gameIds = implode(',', $gameIds);
 
@@ -1795,7 +1809,7 @@ class ApplyController extends BaseController
             $promoteId = $promote['id'];
         }
         $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
-        $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
+        $game = M('game', 'tab_')->field(['id', 'icon', 'apply_auth'])->where(['id' => $gameId])->find();
         if ($apply == null) {
             $this->ajaxReturn([
                 'status' => 0, 
@@ -1805,6 +1819,16 @@ class ApplyController extends BaseController
             ]);
         }
 
+        $applyService = new ApplyService();
+        if (!$applyService->checkSociatyPerm($promote, $game)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '该游戏未授权',
+                'data' => [
+                ]
+            ]);
+        }
+
         $promoteService = new PromoteService();
         if (!$promoteService->canPresidentApplyGame($promote)) {
             $this->ajaxReturn([
@@ -1817,7 +1841,6 @@ class ApplyController extends BaseController
         
         $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
 
-        $applyService = new ApplyService();
         $result = $applyService->checkApplyStatus($apply);
         if (!$result['status']) {
             $this->ajaxReturn([
@@ -1847,7 +1870,8 @@ class ApplyController extends BaseController
         }
 
         $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
-        $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
+        $game = M('game', 'tab_')->field(['icon', 'apply_auth', 'id'])->where(['id' => $gameId])->find();
+
         if ($apply == null) {
             $this->ajaxReturn([
                 'status' => 1, 
@@ -1857,6 +1881,16 @@ class ApplyController extends BaseController
             ]);
         }
 
+        $applyService = new ApplyService();
+        if (!$applyService->checkSociatyPerm($promote, $game)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '该游戏未授权',
+                'data' => [
+                ]
+            ]);
+        }
+
         $promoteService = new PromoteService();
         if (!$promoteService->canPresidentApplyGame($promote)) {
             $this->ajaxReturn([
@@ -1869,7 +1903,6 @@ class ApplyController extends BaseController
 
         $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
 
-        $applyService = new ApplyService();
         $result = $applyService->checkApplyStatus($apply);
         if (!$result['status']) {
             $this->ajaxReturn([
diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 5f33d9a21..35674dc43 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -258,7 +258,7 @@
       <div class="text-wrapper">
          <div style="padding: 0 0.39rem 0.15rem 0.36rem;">
             <?php if (($game['download_ways'] & 2) == 2):?>
-          <div class="text">极速下载：畅享稳定游戏，拒绝频繁掉签，极速下载，不丢游戏，不丢数据，高端定制，仅针对IOS用户免费开放！</div>
+          <div class="text">极速下载：免费极速下载，高端定制，游戏稳定，仅针对IOS用户开放！</div>
           <?php endif;?>
           <?php if (($game['download_ways'] & 4) == 4):?>
           <div class="text">至尊下载：10元购买，永不闪退、不丢数据稳定与保障。同意设备安装一次可在一年内无限次下载重装，并赠送限量至尊超级礼包！</div>
diff --git a/Data/update.sql b/Data/update.sql
index 2ea456ec1..2998e4fa1 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1171,7 +1171,7 @@ CREATE TABLE `tab_reward_record` (
   `creater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者ID',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
+-- 2020-02-10 liuweiwen 内部公司信息
 CREATE TABLE `tab_company_info` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `partner` varchar(60) NOT NULL COMMENT '合作方名称',
@@ -1332,3 +1332,18 @@ ALTER TABLE `tab_promote_company`
 	CHANGE COLUMN `bank_address` `bank_address` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '开户网点' AFTER `bank_name`,
 	CHANGE COLUMN `platform_name` `platform_name` VARCHAR(60) NOT NULL DEFAULT '' COMMENT '平台名称' AFTER `bank_address`,
 	CHANGE COLUMN `contact_begin` `contact_begin` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '合同开始时间' AFTER `platform_name`;
+
+---财务每月分类汇总表 chenzhi----
+CREATE TABLE `tab_financial_summary` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '汇总分类:1按收入类型,2按合作方不包含绑币,3按合作方包含绑币,4按支付渠道,5支付类型',
+  `key_name` varchar(50) DEFAULT '' COMMENT '类型名称',
+  `sort` int(11) DEFAULT '0' COMMENT '排序',
+  `sum_money` decimal(10,2) DEFAULT '0.00' COMMENT '流水',
+  `count_month` varchar(10) DEFAULT '' COMMENT '统计月份',
+  `count_year` varchar(10) DEFAULT '' COMMENT '统计年份',
+  `create_time` int(10) NOT NULL DEFAULT '0' COMMENT '最后更新时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `count_year` (`count_year`) USING BTREE,
+  KEY `key_name` (`key_name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='财务分类汇总统计';