diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 2e6b1472d..bc21c9332 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -6451,6 +6451,145 @@ if ($key == 'model'){
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
     }
 
+
+    /**
+     *充值-》财务管理-》游戏统计-》导出
+     */
+    public function exportGameStatistics() {
+        $month = I("count_date");
+        $xlsName = $month . '游戏统计导出';
+
+        $xlsCell = array(
+            array('game_name','游戏'),
+            array('partner_name','合作公司'),
+            array('cash_count','游戏现金金额'),
+            array('balance_coin_count','平台币直充支出'),
+            array('inside_cash_count','内充支出'),
+            array('all_cash_count','游戏内充值合计'),
+        );
+
+        $map = [];
+
+        $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
+        if ($game_ids) {
+            $map['s.game_id'] = ['in', $game_ids];
+        }
+
+        if (!empty(I('partner_id'))) {
+            $map['g.partner_id'] = I('partner_id');
+        }
+
+        if (!empty(I('timestart'))) {
+            $timestart = strtotime(I('timestart'));
+            $map['_string'] = "s.pay_time > {$timestart}";
+        }
+
+        if (!empty(I('timeend'))) {
+            $timeend = strtotime(I('timeend'));
+            $map['_string'] .= " and s.pay_time < {$timeend}";
+        }
+
+        $xlsData = D("spend")->gameStatistics($map);
+        foreach ($xlsData as $key => $value) {
+            $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
+        }
+
+        $totalData = D("spend")->totalGameStatistics($map);
+
+        $sumCash = $totalData['cash_count'];
+        $sumBalance = $totalData['balance_coin_count'];
+        $sumInside = $totalData['inside_cash_count'];
+        $sumAll = $sumCash + $sumBalance + $sumInside;
+
+        $sumData = [['game_name'=>'总计',
+            'cash_count'=>$sumCash,
+            'balance_coin_count'=>$sumBalance,
+            'inside_cash_count'=>$sumInside,
+            'all_cash_count'=>$sumAll]];
+        $xlsData = array_merge($xlsData,$sumData);
+
+        $this->exportExcel($xlsName, $xlsCell, $xlsData);
+    }
+
+    public function gameStatisticsDetail() {
+        $game_name = I("game_name");
+        $xlsName = $game_name . '游戏订单查看';
+
+        $xlsCell = array(
+            array('pay_order_number','支付订单号'),
+            array('extend','游戏订单号'),
+            array('pay_time','充值时间'),
+            array('user_account','玩家账号'),
+            array('game_name','游戏名称'),
+            array('promote_account','所属推广员'),
+            array('spend_ip','充值ip'),
+            array('server_name','游戏区服'),
+            array('game_player_name','角色名称'),
+            array('cost','订单金额'),
+            array('pay_amount','实付金额'),
+            array('pay_way','充值方式'),
+        );
+
+        if (isset($_REQUEST['pay_way'])) {
+            $map['pay_way'] = $_REQUEST['pay_way'];
+        }
+
+        if (!empty($_REQUEST['pay_order_number'])) {
+            $map['pay_order_number'] = $_REQUEST['pay_order_number'];
+        }
+
+        if (!empty(I('partner_id'))&&empty(I("game_id"))) {
+            $wherePartner = I('partner_id');
+            $gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
+            $gameId = implode(',',array_column($gameId,'id'));
+            $map['game_id'] = ['in',$gameId];
+        }
+
+        if (!empty(I('timestart'))) {
+            $timestart = strtotime(I('timestart'));
+            $map['_string'] = "pay_time > {$timestart}";
+        }
+
+        if (!empty(I('timeend'))) {
+            $timeend = strtotime(I('timeend'));
+            $map['_string'] .= " and pay_time < {$timeend}";
+        }
+
+        $map['pay_status'] = 1;
+        if (!empty(I("game_id"))) {
+            $map['game_id'] = I("game_id");
+        }
+        if (!empty(I('user_account'))) {
+            $map['user_account'] = array('like','%'.I("user_account").'%');
+        }
+        if (!empty(I('user_nickname'))) {
+            $map['game_player_name'] = array('like',I("user_nickname").'%');
+        }
+
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,extend";
+        $group = "";
+        $order = "pay_time DESC";
+
+        $xlsData = D('spend')->getSpendData($map,$field,$group,$order);
+        foreach($xlsData as $key => $value) {
+            $xlsData[$key]['pay_way'] = getPayType($value['pay_way']);
+        }
+
+        $totalData = D("spend")->totalGameStatistics($map, false);
+
+        $sumCash = $totalData['cash_count'] ?? 0;
+        $sumBalance = $totalData['balance_coin_count'] ?? 0;
+        $sumInside = $totalData['inside_cash_count'] ?? 0;
+        $sumAll = $sumCash + $sumBalance + $sumInside;
+
+        $sumData = [['pay_order_number'=>'总计:' . $sumAll,
+            'extend'=>'现金金额:' . $sumCash,
+            'pay_time'=>'平台币:' . $sumBalance,
+            'user_account'=>'绑币:' . $sumInside]];
+        $xlsData = array_merge($xlsData,$sumData);
+        $this->exportExcel($xlsName, $xlsCell, $xlsData);
+    }
+
     function gameFinanceDetail() {
 
 //        set_time_limit(0);
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 90d95c622..509dbbc49 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -129,7 +129,11 @@ class FinanceController extends ThinkController
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $row=10;
-        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+        if(isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        }else{
+            $row = 10;
+        }
 
         $map = [];
         if(!empty(I('count_date'))){
@@ -519,6 +523,7 @@ class FinanceController extends ThinkController
         $this->display();
 
     }
+
     public function getPromoteUser($p = 1)
     {
         $page = intval($p);
@@ -688,4 +693,163 @@ class FinanceController extends ThinkController
 
     }
 
+
+    /**
+     *游戏统计
+     */
+    public function gameStatistics($p = 1) {
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $row = $_REQUEST['row'] ?? 10;
+
+        $map = [];
+
+        $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
+        if ($game_ids) {
+            $map['s.game_id'] = ['in', $game_ids];
+        }
+
+        if (!empty(I('partner_id'))) {
+            $map['g.partner_id'] = I('partner_id');
+        }
+
+        if (!empty(I('timestart'))) {
+            $timestart = strtotime(I('timestart'));
+            $map['_string'] = "s.pay_time > {$timestart}";
+        }
+
+        if (!empty(I('timeend'))) {
+            $timeend = strtotime(I('timeend'));
+            $map['_string'] .= " and s.pay_time < {$timeend}";
+        }
+
+       //游戏统计列表
+        $data = D("spend")->gameStatistics($map, $row, $p);
+        foreach ($data as $key => $value) {
+            $data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
+        }
+
+        $allData = D("spend")->gameStatistics($map);//列表总数
+        $count = count($allData);
+        $page = set_pagination($count, $row);
+        if ($page) {
+            $this->assign('_page', $page);//分页
+        }
+
+        //统计合计
+        $totalData = D("spend")->totalGameStatistics($map);
+
+        $sumCash = $totalData['cash_count'];
+        $sumBalance = $totalData['balance_coin_count'];
+        $sumInside = $totalData['inside_cash_count'];
+        $sumAll = $sumCash + $sumBalance + $sumInside;
+
+        $this->assign('sumCash', $sumCash);
+        $this->assign('sumBalance', $sumBalance);
+        $this->assign('sumInside', $sumInside);
+        $this->assign('sumAll', $sumAll);
+        $this->assign('data',$data);
+
+        $this->display();
+    }
+
+    public function gameStatisticsDetail($p = 1) {
+        set_time_limit(0);
+
+        if (isset($_REQUEST['pay_way'])) {
+            $map['pay_way'] = $_REQUEST['pay_way'];
+        }
+
+        if (!empty($_REQUEST['pay_order_number'])) {
+            $map['pay_order_number'] = $_REQUEST['pay_order_number'];
+        }
+
+        if (!empty(I('partner_id'))&&empty(I("game_id"))) {
+            $wherePartner = I('partner_id');
+            $gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
+            $gameId = implode(',',array_column($gameId,'id'));
+            $map['game_id'] = ['in',$gameId];
+        }
+
+        if (!empty(I('timestart'))) {
+            $timestart = strtotime(I('timestart'));
+            $map['_string'] = "pay_time > {$timestart}";
+        }
+
+        if (!empty(I('timeend'))) {
+            $timeend = strtotime(I('timeend'));
+            $map['_string'] .= " and pay_time < {$timeend}";
+        }
+//        var_dump($map);die();
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+        $map['pay_status'] = 1;
+        if (!empty(I("game_id"))) {
+            $map['game_id'] = I("game_id");
+        }
+        if (!empty(I('user_account'))) {
+            $map['user_account'] = array('like','%'.I("user_account").'%');
+        }
+        if (!empty(I('user_nickname'))) {
+            $map['game_player_name'] = array('like',I("user_nickname").'%');
+        }
+//        var_dump($map);die();
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $group = "";
+        $order = "pay_time DESC";
+        $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
+        foreach($data as $key => $value) {
+            $data[$key]['pay_way'] = getPayType($value['pay_way']);
+        }
+
+        $totalData = D('spend')->totalGameStatistics($map, false);
+        $sumCash = $totalData['cash_count'] ?? 0;
+        $sumBalance = $totalData['balance_coin_count'] ?? 0;
+        $sumInside = $totalData['inside_cash_count'] ?? 0;
+        $sumAll = $sumCash + $sumBalance + $sumInside;
+
+        $this->assign('sumCash', $sumCash);
+        $this->assign('sumBalance', $sumBalance);
+        $this->assign('sumInside', $sumInside);
+        $this->assign('sumAll', null_to_0($sumAll));
+
+        $count = D("spend")->getSpendData($map,$field,$group,$order);
+
+        $count = count($count);
+        $page = set_pagination($count,$row);
+        if($page) {$this->assign('_page', $page);}
+        $this->meta_title = '游戏订单查看';
+
+        $this->assign('data',$data);
+
+        $this->display();
+    }
+
+
+    /**
+     *获取合作公司
+     */
+    public function getPartnetList()
+    {
+        $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
+        if ($game_ids) {
+            $map['g.id'] = ['in', $game_ids];
+        }
+        if (I('sdk_type')) {
+            $map['sdk_version'] = I('sdk_type');
+        }
+        $data = M('partner','tab_')->alias('p')
+            ->join('left join tab_game as g on g.partner_id = p.id')
+            ->field("partner, p.id")
+            ->where($map)
+            ->group('p.id')
+            ->select();
+        $this->ajaxReturn($data,'json');
+    }
+
 }
\ No newline at end of file
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 887b37be4..8c5eb69ba 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -335,7 +335,8 @@ class PromoteController extends ThinkController
             $this->m_title = '推广员列表';
             $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
 
-
+            $companys = M('promote_company','tab_')->select();
+            $this->assign('companys', $companys);
             $this->display();
         }
     }
diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php
index 6f5e3ab07..c761281c6 100644
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
@@ -829,4 +829,49 @@ class SpendModel extends Model
     }
 
 
+    /**
+     *获取游戏统计列表数据
+     * @param $map array 查询条件
+     * @param $row int 每页条数
+     * @param $page int 第几页
+     */
+    public function gameStatistics($map, $row = 0, $page = 1)
+    {
+        $query = $this->alias("s")
+            ->field("s.game_id,s.game_name,p.partner as partner_name,
+            SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count")
+            ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
+            ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
+            ->where(['s.pay_status' => 1])
+            ->where($map)
+            ->group('s.game_id');
+        if ($row) {
+            $query = $query->page($page,$row);
+        }
+        $data = $query->select();
+        return $data;
+    }
+
+    /**
+     *获取游戏统计列表数据
+     */
+    public function totalGameStatistics($map, $join = true)
+    {
+        $query = $this->alias("s")
+            ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count");
+        if ($join) {
+            $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
+                ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id');
+        }
+        $data = $query->where(['s.pay_status' => 1])
+            ->where($map)
+            ->find();
+        return $data;
+    }
+
+
 }
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
new file mode 100644
index 000000000..0aa6f32f5
--- /dev/null
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -0,0 +1,382 @@
+<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>
+  <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: inline-block;
+      color: #056dae;
+    }
+
+    .tooltip .tooltiptext {
+      visibility: hidden;
+      width: 250%;
+      background-color: #fff;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 80%;
+      left: 0;
+      margin-left: -70%;
+      border: #000 solid 1px;
+    }
+
+    .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: #000;
+      visibility: visible;
+      line-height: 20px;
+    }
+
+  </style>
+
+
+  <div class="cf main-place top_nav_list navtab_list">
+
+    <h3 class="page_title">{$_REQUEST['count_date']}游戏统计</h3>
+    <p class="description_text"></p>
+  </div>
+
+  <div class="cf top_nav_list">
+
+    <!-- 高级搜索 -->
+    <div class="jssearch fl cf search_list">
+      <!--游戏类型搜索END-->
+      <div class="input-list input-list-server search_label_rehab">
+        <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>
+          </volist>
+        </select>
+      </div>
+      <div class="input-list input-list-game search_label_rehab">
+        <select id="game_name" name="game_name" class="select_gallery" >
+          <option value="">游戏名称</option>
+          <!-- <volist name=":get_game_list(null, $_GET['game_type'])" id="vo">
+              <option game-id="{$vo.id}" value="{$vo.id}">{$vo.game_name}</option>
+          </volist> -->
+        </select>
+      </div>
+      <div class="input-list input-list-game search_label_rehab">
+          <select id="sdk_type" name="sdk_type" class="select_gallery" >
+              <option value="">请选择设备类型</option>
+              <option value="1">安卓</option>
+              <option value="2">苹果</option>
+          </select>   
+      </div>
+
+      <div class="input-list">
+        <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
+               placeholder="开始时间"/>
+        -
+        <div class="input-append date" id="datetimepicker" style="display:inline-block">
+          <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
+                 placeholder="结束时间"/>
+          <span class="add-on"><i class="icon-th"></i></span>
+        </div>
+      </div>
+
+      <input type="hidden" name="from" value="{$_GET['from']}"/>
+      <div class="input-list">
+        <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatistics','model='.$model['name'].'&row='.I('row'),false)}"
+           style="width: 100px;border: #3C95C8 solid 1px;">搜索</a>
+<!--        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>-->
+        <a class="sch-btn" href="{:U('Export/exportGameStatistics',
+                array(
+                 'timestart'=>$_GET['timestart'],
+                  'timeend'=>$_GET['timeend'],
+                'sdk_type'=>$_GET['sdk_type'],
+                'game_name'=>$_GET['game_name'],
+                'game_id'=>$_REQUEST['game_id'],
+                'partner_id'=>$_REQUEST['partner_id'],
+                false))}"
+           style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+      </div>
+
+
+
+    </div>
+  </div>
+
+
+  <!-- 数据列表 -->
+  <div class="data_list">
+    <div class="">
+      <table>
+        <!-- 表头 -->
+        <thead>
+        <tr>
+          <th>合作公司</th>
+
+          <th >游戏</th>
+
+          <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
+
+          <th ><div class="tooltip">平台币直充支出<span class="tooltiptext"><span style="margin-left: -10px">平台币购买游戏道具所产生的金额</span></span></div></th>
+
+          <th ><div class="tooltip">内充支出<span class="tooltiptext"><span style="margin-left: -10px">玩家用绑币购买游戏道具所产生的金额</span></span></div></th>
+
+          <th ><div class="tooltip">游戏内充值合计<span class="tooltiptext"><span style="margin-left: -10px">游戏现金金额+平台币直充支出+平台币内充支出</span></span></div></th>
+
+          <th >操作</th>
+        </tr>
+        </thead>
+        <!-- 列表 -->
+        <tbody>
+        <style>
+          .data-table thead th, .data-table tbody td{text-align:center}
+          .data-table tbody td{border-right:1px solid #DDDDDD;}
+          .d_list .drop-down ul {z-index:999;}
+        </style>
+                <if condition = "empty($data)">
+                  <tr>
+                    <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
+                  </tr>
+                </if>
+        <notemtpy name = "data">
+          <volist name="data" id="data">
+            <tr>
+              <td ><if condition="$data.partner_name neq ''">{$data.partner_name}<else/>无</if></td>
+              <td ><if condition="$data.game_name neq ''">{$data.game_name}<else/>无</if></td>
+              <td ><if condition="$data.cash_count neq ''">{$data.cash_count}<else/>0</if></td>
+              <td ><if condition="$data.balance_coin_count neq ''">{$data.balance_coin_count}<else/>0</if></td>
+              <td ><if condition="$data.inside_cash_count neq ''">{$data.inside_cash_count}<else/>0</if></td>
+              <td ><if condition="$data.all_cash_count neq ''">{$data.all_cash_count}<else/>0</if></td>
+              <td >
+                <a href="{:U('Finance/gameStatisticsDetail',array(
+                'timestart'=>$_GET['timestart'],
+                'timeend'=>$_GET['timeend'],
+                'sdk_type'=>$_GET['sdk_type'],
+                'game_id'=>$data['game_id'],
+                'game_name'=>$data['game_name'],
+                'partner_id'=>$_REQUEST['partner_id'],
+                false))}" >查看</a>
+              </td>
+            </tr>
+          </volist>
+          <tr>
+            <td colspan="2" ><span>总计</span></td>
+            <td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
+            <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
+            <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>
+            <td><if condition="$sumAll neq ''">{$sumAll}<else/>0</if></td>
+            <td>
+              <a href="{:U('Finance/gameStatisticsDetail',
+                array(
+                 'timestart'=>$_GET['timestart'],
+                  'timeend'=>$_GET['timeend'],
+                'sdk_type'=>$_GET['sdk_type'],
+                'game_name'=>$_GET['game_name'],
+                'game_id'=>$_REQUEST['game_id'],
+                'partner_id'=>$_REQUEST['partner_id'],
+                false))}" >查看</a>
+            </td>
+          </tr>
+        </notemtpy>
+
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="page">
+
+    {$_page|default=''}
+  </div>
+</block>
+
+<block name="script">
+  <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+  <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></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>
+    <volist name=":I('get.')" id="vo">
+      Think.setValue('{$key}',"{$vo}");
+    </volist>
+  </script>
+  <script type="text/javascript">
+
+    $('.page a').click(function () {
+      var href = $(this).attr('href');
+      $(this).removeAttr('href');
+      window.location.replace(href)
+      console.log(href)
+    });
+
+    //导航高亮
+    highlight_subnav('{:U('Finance/gameStatistics')}');
+    $(function(){
+
+      //搜索功能
+      $("#search").click(function(){
+        var starttime = $.trim($('#time-start').val());
+        var endtime = $.trim($('#time-end').val());
+
+        if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
+
+        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;
+        }
+        window.location.replace(url);
+      });
+
+      //回车自动提交
+      $('.jssearch').find('input').keyup(function(event){
+        if(event.keyCode===13){
+          $("#search").click();
+        }
+      });
+      $(".ljcz").click(function(){
+        var id = $(this).attr('data-value');
+        var game_name = "{:I('game_name')}";
+        var server_name = "{:I('server_id')}";
+        layer.open({
+          type: 2,
+          title: '游戏消费记录',
+          shadeClose: true,
+          shade: 0.8,
+          area: ['70%', '80%'],
+          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+        });
+      });
+
+      function get_game_list()
+      {
+        var game_name = "{:I('game_name')}";
+        $.ajax({
+          url:"{:U('Finance/getGameList')}",
+          type:"post",
+          data:{partner_id:$("#partner_id option:selected").val(), sdk_type:$("#sdk_version1 option:selected").val()},
+          dataType:'json',
+          success:function(data){
+            var str = "<option value=''>请选择游戏</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].game_name+"'"+(game_name && data[i].game_name == game_name?'selected':'')+">"+data[i].game_name+"</option>"
+            }
+            // console.log(str);
+            $("#game_name").empty();
+            $("#game_name").append(str);
+            // $("#server_id").select2();
+
+          }
+        })
+      }
+      $("#partner_id, #sdk_type").change(function(){
+        get_game_list();
+      });
+
+      $('#time-start').datetimepicker({
+        format: 'yyyy-mm-dd',
+        language: "zh-CN",
+        showMeridian:true,
+        pickDate:true,
+        minView: 2,
+        autoclose: true,
+        pickTime:true,
+        todayBtn:true,
+      }).on('change',function(ev){
+        var val = new Date($.trim($(this).val())).getTime();
+        var end = new Date($.trim($('#time-end').val())).getTime();
+        if (val>end) {
+          layer.msg('开始时间大于结束时间！');$(this).val('');
+        }
+        return false;
+      });
+
+      $("#time-end").datetimepicker({
+        format:"yyyy-mm-dd",
+        language: "zh-CN",
+        showMeridian:true,
+        minView:2,
+        autoclose:true,
+        todayBtn:true,
+      }).on('change',function(ev){
+        var val = new Date($.trim($(this).val())).getTime();
+        var start = new Date($.trim($('#time-start').val())).getTime();
+        if (val<start) {
+          layer.msg('开始时间大于结束时间！');$(this).val('');
+        }
+        return false;
+      });
+
+      $("#partner_id").change();
+
+      function get_partnet_list()
+      {
+        var partner_id = "{:I('partner_id')}";
+        $.ajax({
+          url:"{:U('Finance/getPartnetList')}",
+          type:"post",
+          data:{game_name:$("#game_name option:selected").val(), sdk_type:$("#sdk_version1 option:selected").val()},
+          dataType:'json',
+          success:function(data){
+            var str = "<option value=''>请选择合作公司</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].id+"'"+(partner_id && data[i].id == partner_id?'selected':'')+">"+data[i].partner+"</option>"
+            }
+            // console.log(str);
+            $("#partner_id").empty();
+            $("#partner_id").append(str);
+            // $("#server_id").select2();
+
+          }
+        })
+      }
+      $("#game_name, #sdk_type").change(function(){
+        get_partnet_list();
+      });
+
+      $("#game_name").change();
+    })
+  </script>
+</block>
diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html
new file mode 100644
index 000000000..d345138f5
--- /dev/null
+++ b/Application/Admin/View/Finance/gameStatisticsDetail.html
@@ -0,0 +1,327 @@
+<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>
+  <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;}
+  </style>
+
+
+  <div class="cf main-place top_nav_list navtab_list">
+
+    <h3 class="page_title">{$_REQUEST['game_name']}游戏订单查看</h3>
+    <p class="description_text"></p>
+  </div>
+
+  <div class="cf top_nav_list">
+
+    <!-- 高级搜索 -->
+    <div class="jssearch fl cf search_list">
+      <!--游戏类型搜索END-->
+
+      <div class="input-list">
+        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+      </div>
+      <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
+      <input type="hidden" name="game_id" value="{$_GET['game_id']}"/>
+      <input type="hidden" name="game_name" value="{$_GET['game_name']}"/>
+
+      <div class="input-list">
+        <input type="text"  name="pay_order_number" placeholder="请输入支付订单号" class="" value="{:I('pay_order_number')}" style="width: 180px"/>&nbsp;
+      </div>
+      <div class="input-list">
+
+        <input type="text"  name="user_account" placeholder="请输入玩家账号" class="" value="{:I('user_account')}" style="width: 180px"/>&nbsp;
+      </div>
+<!--      <div class="input-list">-->
+
+<!--        <input type="text"  name="user_nickname" placeholder="请输入角色名称" class="" value="{:I('user_nickname')}" style="width: 180px"/>&nbsp;-->
+<!--      </div>-->
+      <div class="input-list">
+        <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
+               placeholder="开始时间"/>
+        -
+        <div class="input-append date" id="datetimepicker" style="display:inline-block">
+          <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
+                 placeholder="结束时间"/>
+          <span class="add-on"><i class="icon-th"></i></span>
+        </div>
+      </div>
+
+      <div class="input-list input-list-server search_label_rehab">
+        <select id="pay_way" name="pay_way" class="select_gallery"  style="width:120px;">
+          <option value="">请选择支付渠道</option>
+          <option value="1">支付宝</option>
+          <option value="2">微信(扫码)</option>
+          <option value="3">微信app</option>
+          <option value="4">威富通</option>
+          <option value="5">聚宝云</option>
+          <option value="6">竣付通</option>
+          <option value="7">金猪</option>
+          <option value="9">双乾支付-支付宝</option>
+          <option value="10">双乾支付-银联</option>
+          <option value="15">双乾支付-快捷</option>
+          <option value="0">平台币</option>
+          <option value="-1">绑币</option>
+        </select>
+      </div>
+
+      <div class="input-list">
+
+        <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"
+           style="">搜索</a>
+        <if condition="$_GET['all'] neq 1">
+          <a class="sch-btn" href="{:U('Export/gameStatisticsDetail',
+                  array(
+                  'game_id'=>$_GET['game_id'],
+                  'game_name'=>$_GET['game_name'],
+                  'pay_way'=>$_GET['pay_way'],
+                  'timestart'=>$_GET['timestart'],
+                  'timeend'=>$_GET['timeend'],
+                  'user_account'=>$_GET['user_account'],
+                  'pay_order_number'=>$_GET['pay_order_number'],
+                  false))}">导出</a>
+        </if>
+      </div>
+    </div>
+  </div>
+
+
+  <!-- 数据列表 -->
+  <div class="data_list">
+    <div class="">
+      <table>
+        <!-- 表头 -->
+        <thead>
+        <tr>
+          <th >支付订单号</th>
+
+          <th>充值时间</th>
+
+          <th >玩家账号</th>
+
+          <th >游戏名称</th>
+
+          <th >所属推广员</th>
+
+          <th >充值ip</th>
+
+          <th >游戏区服</th>
+
+          <th >角色名称</th>
+
+          <th >订单金额</th>
+
+          <th >实付金额</th>
+
+          <th >充值方式</th>
+        </tr>
+        </thead>
+        <!-- 列表 -->
+        <tbody>
+        <style>
+          .data-table thead th, .data-table tbody td{text-align:center}
+          .data-table tbody td{border-right:1px solid #DDDDDD;}
+          .d_list .drop-down ul {z-index:999;}
+        </style>
+                <if condition = "empty($data)">
+                  <tr>
+                    <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
+                  </tr>
+                </if>
+        <notemtpy name = "data">
+          <volist name="data" id="data">
+            <tr>
+              <td >{$data.pay_order_number}</td>
+              <td >{$data.pay_time}</td>
+              <td >{$data.user_account}</td>
+              <td >{$data.game_name}</td>
+              <td >{$data.promote_account}</td>
+              <td >{$data.spend_ip}</td>
+              <td >{$data.server_name}</td>
+              <td >{$data.game_player_name}</td>
+              <td >{$data.cost}</td>
+              <td >{$data.pay_amount}</td>
+              <td >{$data.pay_way}</td>
+            </tr>
+          </volist>
+          <tr>
+            <td ><span>总计</span></td>
+            <td colspan="11" ><span><if condition="$sumAll neq ''">累计充值：{$sumAll}<else/>0</if>
+            （现金金额：{$sumCash} 平台币：{$sumBalance} 绑币：{$sumInside}）
+            </span></td>
+          </tr>
+        </notemtpy>
+
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="page">
+
+    {$_page|default=''}
+  </div>
+</block>
+
+<block name="script">
+  <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+  <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></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>
+    <volist name=":I('get.')" id="vo">
+      Think.setValue('{$key}',"{$vo}");
+    </volist>
+  </script>
+  <script type="text/javascript">
+    //导航高亮
+    highlight_subnav('{:U('Finance/gameStatistics')}');
+    $(function(){
+
+      $('.page a').click(function () {
+        var href = $(this).attr('href');
+        $(this).removeAttr('href');
+        window.location.replace(href)
+        console.log(href)
+      });
+
+      $('#time-start').datetimepicker({
+        format: 'yyyy-mm-dd',
+        language: "zh-CN",
+        showMeridian:true,
+        pickDate:true,
+        minView: 2,
+        autoclose: true,
+        pickTime:true,
+        todayBtn:true,
+      }).on('change',function(ev){
+        var val = new Date($.trim($(this).val())).getTime();
+        var end = new Date($.trim($('#time-end').val())).getTime();
+        if (val>end) {
+          layer.msg('开始时间大于结束时间！');$(this).val('');
+        }
+        return false;
+      });
+
+      $("#time-end").datetimepicker({
+        format:"yyyy-mm-dd",
+        language: "zh-CN",
+        showMeridian:true,
+        minView:2,
+        autoclose:true,
+        todayBtn:true,
+      }).on('change',function(ev){
+        var val = new Date($.trim($(this).val())).getTime();
+        var start = new Date($.trim($('#time-start').val())).getTime();
+        if (val<start) {
+          layer.msg('开始时间大于结束时间！');$(this).val('');
+        }
+        return false;
+      });
+
+      //搜索功能
+      $("#search").click(function(){
+        var starttime = $.trim($('#time-start').val());
+        var endtime = $.trim($('#time-end').val());
+
+        if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
+
+        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;
+        }
+        window.location.replace(url);
+      });
+
+      //回车自动提交
+      $('.jssearch').find('input').keyup(function(event){
+        if(event.keyCode===13){
+          $("#search").click();
+        }
+      });
+      $(".ljcz").click(function(){
+        var id = $(this).attr('data-value');
+        var game_name = "{:I('game_name')}";
+        var server_name = "{:I('server_id')}";
+        layer.open({
+          type: 2,
+          title: '游戏消费记录',
+          shadeClose: true,
+          shade: 0.8,
+          area: ['70%', '80%'],
+          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+        });
+      });
+
+      $("#game_id").change(function(){
+        $.ajax({
+          url:"{:U('Ajax/getSpendServer')}",
+          type:"post",
+          data:{game_id:$("#game_id option:selected").attr('game-id')},
+          dataType:'json',
+          success:function(data){
+            str = "<option value=''>请选择区服</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].server_name+"'>"+data[i].server_name+"</option>"
+            }
+            $("#server_id").empty();
+            $("#server_id").append(str);
+            $("#server_id").select2();
+
+          }
+        })
+      });
+      var game_id = "{:I('game_name')}";
+      var game_server = "{:I('server_id')}";
+      if(game_id){
+        $.ajax({
+          url:"{:U('Ajax/getSpendServer')}",
+          type:"post",
+          data:{game_id:game_id,type:2},
+          dataType:'json',
+          success:function(data){
+            str = "<option value=''>请选择区服</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
+            }
+            $("#server_id").empty();
+            $("#server_id").append(str);
+            $("#server_id").select2();
+
+          }
+        })
+      }
+    })
+  </script>
+</block>
diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html
index 3c39f46fc..d6f997125 100644
--- a/Application/Admin/View/Promote/edit.html
+++ b/Application/Admin/View/Promote/edit.html
@@ -168,6 +168,22 @@
                         </td>
                     </tr>
                     </if>
+
+                    <if condition="$data['company_id'] == 0">
+                        <tr>
+                            <td class="l">推广公司：</td>
+                            <td class="r">
+                                <select name="company_id" id="company_id">
+                                    <option value="0">请选择推广公司</option>
+                                    <volist name="companys" id="vo">
+                                        <option  value="{$vo.id}">{$vo.company_name}</option>
+                                    </volist>
+                                </select>
+                                <span class="notice-text">设置该推广员所属的推广公司</span>
+                            </td>
+                        </tr>
+                    </if>
+
                     <tr>
                         <td class="l">注册时间：</td>
                         <td class="r">
diff --git a/Data/update.sql b/Data/update.sql
index c8c553d34..9a4de10f8 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -730,14 +730,6 @@ ADD COLUMN `flooring_page_video_cover` int(11) NOT NULL DEFAULT 0 COMMENT '落
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`)
 VALUES ('推广公司录入', 185, 56, 'PromoteCompany/lists', 0, '该功能用于录入工会所属的推广公司名称', '推广员管理', 0, 1);
 
-INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`)
-VALUES ('新增', 567, 0, 'PromoteCompany/add', 0, '', '推广员管理', 0, 1);
-
-INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`)
-VALUES ('编辑', 567, 0, 'PromoteCompany/edit', 0, '', '推广员管理', 0, 1);
-
-INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`)
-VALUES ('删除', 567, 0, 'PromoteCompany/del', 0, '', '推广员管理', 0, 1);
 
 -- 推广员表加入推广公司字段 liuweiwen 20191216
 ALTER TABLE tab_promote ADD `company_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广公司ID';