diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php
index 59f7e8482..7916130e1 100644
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@@ -706,16 +706,20 @@ function getPromoteAccount($promoteId)
     return M('promote', 'tab_')->where($map)->getField('account');
 }
 
-//获取推广员列表 $level 0-全部
-function getPromoteByLevel($level = 0)
+//获取推广员列表 $level 0-全部 $companyId 推广公司 0-全部
+function getPromoteByLevel($level = 0, $companyId = 0)
 {
     $field = 'id, account, real_name';
-    if ($level) {
+    $map['_string'] = '1 = 1';
+    if ($level > 0) {
         $map['level'] = $level;
-        $promotes = M('promote', 'tab_')->field($field)->where($map)->select();
-    } else {
-        $promotes = M('promote', 'tab_')->field($field)->select();
     }
+    if ($companyId > 0) {
+        $map['company_id'] = $companyId;
+    }
+
+    $promotes = M('promote', 'tab_')->field($field)->where($map)->select();
+
     return $promotes;
 }
 
diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php
index ba3504d8e..272a1192a 100644
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@@ -1073,7 +1073,7 @@ public function  auto_rrdae(){
         $map['level'] = 1;
         $map['ver_status'] = 1;
         $map['settlement_type'] = ($settlement == 3) ? 1 : $settlement;
-        $promotes = M('promote', 'tab_')->field('id, account, chain, settlement_type')->where($map)->select();
+        $promotes = M('promote', 'tab_')->field('id, account, chain, settlement_type, auto_review_withdraw_status')->where($map)->select();
         $success = 0;
         $error_withdraw = 0;
         $error_spend = 0;
diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index 0f6701687..a0db7e13b 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -22,22 +22,44 @@ class PromoteGameRatioController extends ThinkController
     {
         $params = I('get.');
         $group = $params['group'] ?? 1;
+        $companyId = $params['company_id'] ?? 0;
+        $companyBelong = $params['company_belong'] ?? '';
         $promoteId = $params['promote_id'] ?? 0;
         $gameId = $params['game_id'] ?? 0;
+        $gameTypeId = $params['game_type_id'] ?? 0;
         $status = $params['status'] ?? '';
         $page = $params['p'] ? intval($params['p']) : 1;
         $row = $params['row'] ? intval($params['row']) : 10;
 
         $map['_string'] = 'game_id = relation_game_id';
+        $where['_string'] = '1 = 1';
+        if ($companyId || ($companyBelong !== '' && in_array($companyBelong, [0, 1]))) {
+            $promoteMap['_string'] = '1 = 1';
+            if ($companyId) {
+                $promoteMap['company_id'] = $companyId;
+            }
+            if ($companyBelong !== '' && in_array($companyBelong, [0, 1])) {
+                $promoteMap['company_belong'] = $companyBelong;
+            }
+            $promoteIds = D('promote')->where($promoteMap)->getField('id', true);
+            $promoteIds = $promoteIds ?? [-1];
+            $where['promote_id'] = ['in', $promoteIds];
+        }
         if ($promoteId) {
             $map['promote_id'] = intval($promoteId);
         }
+        if ($gameTypeId) {
+            $gameIds = D('game')->where(['game_type_id' => $gameTypeId])->getField('id', true);
+            $gameIds = $gameIds ?? [-1];
+            $where['game_id'] = ['in', $gameIds];
+        }
         if ($gameId) {
             $map['game_id'] = intval($gameId);
         }
         if ($status !== '') {
             $map['status'] = intval($status);
         }
+        $map['_complex'] = $where;
 
         $field = 'create_time, update_time';
         if ($group == 1) {
@@ -68,8 +90,8 @@ class PromoteGameRatioController extends ThinkController
         if ($promoteGameRatios) {
             $promoteIds = array_column($promoteGameRatios, 'promote_id');
             $gameIds = array_column($promoteGameRatios, 'game_id');
-            $promoteFiled = 'id, account, mobile_phone, create_time, status, ver_status';
-            $gameFiled = 'id, relation_game_name, ratio';
+            $promoteFiled = 'id, account, mobile_phone, create_time, status, ver_status, company_id, company_belong';
+            $gameFiled = 'id, relation_game_name, ratio, game_type_name';
             $promotes = M('promote', 'tab_')->where(array('id' => ['in', $promoteIds]))->getField($promoteFiled, true);
             $games = M('game', 'tab_')->where(array('id' => ['in', $gameIds]))->getField($gameFiled, true);
 
@@ -83,14 +105,22 @@ class PromoteGameRatioController extends ThinkController
                 $thisPromoteCreateTime = '未知';
                 $thisPromoteStatus = '待审核';
                 $thisPromoteVerStatus = '未知';
+                $thisCompanyName = '未知';
+                $thisCompanyBelong = '未知';
+                $thisGameTypeName = '未知';
                 $thisGameName = '未知';
                 $thisGameRatio = '0.00%';
                 $thisLastRatio = $promoteGameRatio['last_ratio'] . '%';
                 $thisLastTurnoverRatio = $promoteGameRatio['last_turnover_ratio'] ? json_decode($promoteGameRatio['last_turnover_ratio'], true) : [];
                 $thisLastRatio = $thisLastTurnoverRatio ? "{$thisLastRatio} - " . $thisLastTurnoverRatio[count($thisLastTurnoverRatio) - 1]['ratio'] . '%' : $thisLastRatio;
-                $thisRatio = $promoteGameRatio['ratio'] . '%';
-                $thisTurnoverRatio = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : [];
-                $thisRatio = $thisTurnoverRatio ? "{$thisRatio} - " . $thisTurnoverRatio[count($thisTurnoverRatio) - 1]['ratio'] . '%' : $thisRatio;
+                $thisTurnoverRatios = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : [];
+                $thisRatioDtl = "默认：{$promoteGameRatio['ratio']}%";
+                if ($thisTurnoverRatios) {
+                    foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
+                        $thisIntervalClosedStatusText = isset($thisTurnoverRatio['interval_closed_status']) ? ($thisTurnoverRatio['interval_closed_status'] == 1 ? '≥' : '>') : '≥';
+                        $thisRatioDtl .= "<br>月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
+                    }
+                }
                 $thisLastRatioStatus = $promoteGameRatio['last_ratio_status'];
                 $thisStatusText = self::$statusList[$promoteGameRatio['status']];
                 $thisStatusText = ($promoteGameRatio['status'] == -1) ? '<span style="color: red;">' . $thisStatusText . '</span>' : $thisStatusText;
@@ -106,11 +136,14 @@ class PromoteGameRatioController extends ThinkController
                     $thisPromoteStatus = get_info_status($promotes[$thisPromoteId]['status'], 3);
                     $thisPromoteStatus = $thisPromoteStatus ?? '待审核';
                     $thisPromoteVerStatus = getPromoteVerStatus($promotes[$thisPromoteId]['ver_status'], 2);
+                    $thisCompanyName = getPromoteCompanyName($promotes[$thisPromoteId]['company_id']);
+                    $thisCompanyBelong = $promotes[$thisPromoteId]['company_belong'] == 1 ? '外团' : '内团';
                 }
                 if ($issetGame) {
                     $thisGameName = $games[$thisGameId]['relation_game_name'];
                     $thisGameRatio = $games[$thisGameId]['ratio'];
                     $thisGameRatio = ($thisGameRatio ?? '0.00') . '%';
+                    $thisGameTypeName = $games[$thisGameId]['game_type_name'];
                 }
 
                 $record = [
@@ -121,9 +154,12 @@ class PromoteGameRatioController extends ThinkController
                     'promote_create_time' => $thisPromoteCreateTime,
                     'promote_status_text' => $thisPromoteStatus,
                     'promote_ver_status_text' => $thisPromoteVerStatus,
+                    'company_name' => $thisCompanyName,
+                    'company_belong' => $thisCompanyBelong,
                     'game_name' => $thisGameName,
+                    'game_type_name' => $thisGameTypeName,
                     'last_ratio' => (($thisLastRatioStatus == 1 || $group != 1) ? $thisLastRatio : $thisGameRatio),
-                    'ratio' => $thisRatio,
+                    'ratio_dtl' => $thisRatioDtl,
                     'valid_date' => $validDate,
                     'remark' => $promoteGameRatio['remark'],
                     'status_text' => $thisStatusText,
@@ -158,16 +194,20 @@ class PromoteGameRatioController extends ThinkController
             exit;
         }
 
+        $gameTypelist = getGameTypes();
+        $companys = getPromoteCompanys();
         $reviewRule = $this->getReviewRule();
         $page = set_pagination($count, $row);
         if($page) {
             $this->assign('_page', $page);
         }
+        $this->assign('companys', $companys);
+        $this->assign('gameTypeList', $gameTypelist);
         $this->assign('group', $group);
         $this->assign('records', $records);
         $this->assign('count', $count);
         $this->assign('gameList', getAllGameList(true));
-        $this->assign('promoteList', getPromoteByLevel(1));
+        $this->assign('promoteList', getPromoteByLevel(1, intval(I('company_id', 0))));
         $this->assign('statusList', self::$statusList);
         $this->assign('reviewRule', $reviewRule);
         $this->assign('is_admin', is_administrator());
@@ -192,8 +232,8 @@ class PromoteGameRatioController extends ThinkController
                 $this->error('默认分成比例不能为空');
             }
             $save['turnover_ratio'] = [];
-            if (!empty(array_filter($params['turnover'])) || !empty(array_filter($params['turnover_ratio']))) {
-                if (is_array($params['turnover']) && is_array($params['turnover_ratio'])) {
+            if (!empty(array_filter($params['turnover'])) || !empty(array_filter($params['turnover_ratio'])) || !empty(array_filter($params['interval_closed_status']))) {
+                if (is_array($params['turnover']) && is_array($params['turnover_ratio']) && is_array($params['interval_closed_status'])) {
                     foreach ($params['turnover'] as $turnover) {
                         if (empty($turnover)) {
                             $this->error('月流水不能为空');
@@ -204,6 +244,11 @@ class PromoteGameRatioController extends ThinkController
                             $this->error('月流水分成比例不能为空');
                         }
                     }
+                    foreach ($params['interval_closed_status'] as $intervalClosedStatus) {
+                        if (!in_array($intervalClosedStatus, [1, 2])) {
+                            $this->error('月流水分符号不能为空');
+                        }
+                    }
                     $turnoverCount = count($params['turnover']);
                     $sortTurnover = $params['turnover'];
                     sort($sortTurnover);
@@ -225,12 +270,14 @@ class PromoteGameRatioController extends ThinkController
                         $save['turnover_ratio'][] = [
                             'turnover' => bcdiv($turnover, 1, 2),
                             'ratio' => bcdiv($params['turnover_ratio'][$key], 1, 2),
+                            'interval_closed_status' => (isset($params['interval_closed_status'][$key]) ? $params['interval_closed_status'][$key] : 1),
                         ];
                     }
                     $save['turnover_ratio'] = json_encode($save['turnover_ratio']);
                 }
             }
 
+            $save['interval_closed_status'] = ($params['interval_closed_status'] ? ($params['interval_closed_status'] == 1 ? 1 : 2) : 1);
             $save['ratio'] = $params['ratio'] ?? 0;
             $save['begin_time'] = strtotime($params['begin_time']);
             $save['end_time'] = $params['end_time'] ? (strtotime('+1 month', strtotime($params['end_time'])) - 1) : 0;
@@ -243,14 +290,15 @@ class PromoteGameRatioController extends ThinkController
                 if (empty($promoteGameRatio)) {
                     $this->error('参数异常');
                 }
-                if ($promoteGameRatio['status'] == -1 || $save['begin_time'] != $promoteGameRatio['begin_time'] || $save['end_time'] != $promoteGameRatio['end_time'] || $save['ratio'] != $promoteGameRatio['ratio'] || $save['remark'] != $promoteGameRatio['remark'] || $save['turnover_ratio'] != $promoteGameRatio['turnover_ratio']) {
-                    $this->isWithdraw($promoteGameRatio['promote_id'], $save['begin_time']);
+                if ($promoteGameRatio['status'] == -1 || $save['interval_closed_status'] != $promoteGameRatio['interval_closed_status'] || $save['begin_time'] != $promoteGameRatio['begin_time'] || $save['end_time'] != $promoteGameRatio['end_time'] || $save['ratio'] != $promoteGameRatio['ratio'] || $save['remark'] != $promoteGameRatio['remark'] || $save['turnover_ratio'] != $promoteGameRatio['turnover_ratio']) {
+                    $this->isWithdraw($promoteGameRatio['promote_id'], $save['begin_time'], $save['end_time']);
 
                     if ($promoteGameRatio['status'] == 1) {
                         $save['last_turnover_ratio'] = $promoteGameRatio['turnover_ratio'];
                         $save['last_ratio'] = $promoteGameRatio['ratio'];
                         $save['last_ratio_status'] = 1;
                     }
+                    $saveMap['promote_id'] = $promoteGameRatio['promote_id'];
                     $saveMap['relation_game_id'] = $promoteGameRatio['relation_game_id'];
                     $result = D(self::MODEL_NAME)->where($saveMap)->save($save);
                     $logResult = $result;
@@ -293,7 +341,7 @@ class PromoteGameRatioController extends ThinkController
                     $this->error('参数异常');
                 }
 
-                $this->isWithdraw($promoteId, $save['begin_time']);
+                $this->isWithdraw($promoteId, $save['begin_time'], $save['end_time']);
 
                 $map['promote_id'] = $promoteId;
                 $save['promote_id'] = $promoteId;
@@ -329,6 +377,7 @@ class PromoteGameRatioController extends ThinkController
             $params = I('get.');
             $id = $params['id'] ?? 0;
             $id = intval($id);
+            $companyId = 0;
             $metaTitle = '游戏分成比例申请';
             if ($id) {
                 $metaTitle .= '--修改';
@@ -347,18 +396,30 @@ class PromoteGameRatioController extends ThinkController
                     $lastRatio = ($gameRatio ?? '0.00') . '%';
                 }
 
+                $companyId = $promoteGameRatio['company_id'];
+                $promoteGameRatio['company_id'] = D('promote')->where(['id' => $promoteGameRatio['promote_id']])->getField('company_id');
                 $this->assign('record', $promoteGameRatio);
                 $this->assign('lastRatio', $lastRatio);
             }
 
+            $companys = getPromoteCompanys();
+            $this->assign('companys', $companys);
             $this->assign('gameList', getAllGameList(true));
-            $this->assign('promoteList', getPromoteByLevel(1));
+            $this->assign('promoteList', getPromoteByLevel(1, $companyId));
             $this->meta_title = $metaTitle;
             $this->display();
         }
     }
 
-    private function isWithdraw($promoteId, $beginTime)
+    public function getPromotes()
+    {
+        $level = 1;
+        $companyId = intval(I('company_id', 0));
+        $promotes = getPromoteByLevel($level, $companyId);
+        $this->ajaxReturn($promotes);
+    }
+
+    private function isWithdraw($promoteId, $beginTime, $endTime)
     {
         $promote = M('promote', 'tab_')->find($promoteId);
         if (empty($promote)) {
@@ -370,11 +431,38 @@ class PromoteGameRatioController extends ThinkController
 
         $withdrawMap['promote_id'] = $promoteId;
         $withdrawMap['status'] = ['neq', -2];
+        if (empty($endTime)) {
+            $withdrawWhere['settlement_begin_time'] = ['egt', $beginTime];
+            $withdrawWhere['settlement_end_time'] = ['egt', $beginTime];
+        } else {
+            $withdrawWhere['settlement_begin_time'] = ['between', [$beginTime, $endTime]];
+            $withdrawWhere['settlement_end_time'] = ['between', [$beginTime, $endTime]];
+        }
+        $withdrawWhere['_logic'] = 'or';
+        $withdrawMap['_complex'] = $withdrawWhere;
         $withdrawMap['settlement_begin_time'] = ['egt', $beginTime];
-        $withdraw = M('withdraw', 'tab_')->where($withdrawMap)->order('create_time desc')->find();
-        if (!empty($withdraw) && $withdraw['status'] != -2) {
-            $time = date('Y-m', $beginTime);
-            $this->error("{$time}月已有订单申请提现, 无法变更分成比例，请重新选择开始时间");
+        $withdraws = M('withdraw', 'tab_')->field('settlement_begin_time, settlement_end_time')
+            ->where($withdrawMap)
+            ->order('settlement_begin_time asc, settlement_end_time asc')
+            ->select();
+        if (!empty($withdraws)) {
+            $times = [];
+            $text = '';
+            foreach ($withdraws as $withdraw) {
+                $settlementBeginTime = !empty($withdraw['settlement_begin_time']) ? date('Y-m', $withdraw['settlement_begin_time']) : '';
+                $settlementEndTime = date('Y-m', $withdraw['settlement_end_time']);
+                if ($settlementBeginTime && !in_array($settlementBeginTime, $times)) {
+                    $times[] = $settlementBeginTime;
+                    $text .= "{$settlementBeginTime}月、";
+                }
+                if (!in_array($settlementEndTime, $times)) {
+                    $times[] = $settlementEndTime;
+                    $text .= "{$settlementEndTime}月、";
+                }
+            }
+            $text = rtrim($text, '、');
+            $text .= '已有订单申请提现, 无法变更分成比例，请重新选择开始时间';
+            $this->error($text);
         }
     }
 
diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php
index a346f441f..a28fb5f2e 100644
--- a/Application/Admin/Controller/QueryController.class.php
+++ b/Application/Admin/Controller/QueryController.class.php
@@ -2,6 +2,7 @@
 
 namespace Admin\Controller;
 
+use Admin\Model\PromoteModel;
 use Home\Controller\FileController;
 use User\Api\UserApi as UserApi;
 use Admin\Model\WithdrawModel;
@@ -1005,6 +1006,7 @@ class QueryController extends ThinkController
     public function withdraw()
     {
         $page = I('p', 1);
+        $row = I('row', 10);
         $map['_string'] = '1=1';
         $adminid = C('USER_ADMINISTRATOR');//获取超管id
         $adminmobile = M('UcenterMember')->field('mobile')->find($adminid);
@@ -1030,6 +1032,13 @@ class QueryController extends ThinkController
         } else {
             $map['promote_id'] = array('gt', 0);
         }
+        if (!empty($_REQUEST['company_id'])) {
+            $promoteIds = D('promote')->where(['company_id' => $_REQUEST['company_id']])
+                ->getField('id', true);
+            $promoteIds = $promoteIds ?? [-1];
+            $where['promote_id'] = ['in', $promoteIds];
+            $map['_complex'] = $where;
+        }
 
         $order = 'create_time desc';
         if (isset($_REQUEST['data_order'])) {
@@ -1042,40 +1051,68 @@ class QueryController extends ThinkController
                 }
             }
         }
+
+        $fields = 'id, widthdraw_number, sum_money, promote_id, promote_account, op_id, op_type, last_op_id, last_op_type, settlement_type, settlement_begin_time, settlement_end_time, create_time, status, respond, audit_time';
+        $count = 0;
         if (I('export', 0) == 1) {
-            $records = D('withdraw')->field('widthdraw_number, sum_money, promote_account, op_id, op_type, last_op_id, last_op_type, settlement_type, settlement_begin_time, settlement_end_time, create_time, status, respond, audit_time')
+            $records = D('withdraw')->field($fields)
                 ->where($map)
                 ->order($order)
                 ->select();
-            if (!empty($records)) {
-                $data = [];
-                foreach ($records as $record) {
-                    $record['op_id_text'] = $this->getOpTypeText($record['op_type'], $record['op_id']);
-                    $record['last_op_id_text'] = $this->getOpTypeText($record['last_op_type'], $record['last_op_id']);
-                    $record['op_type_text'] = getPromoteWithdrawOpType($record['op_type']);
-                    $record['last_op_type_text'] = getPromoteWithdrawOpType($record['last_op_type']);
-                    $record['settlement_type_text'] = getPromoteWithdrawSettlementType($record['settlement_type']);
-                    $data[] = [
-                        'widthdraw_number' => $record['widthdraw_number'],
-                        'sum_money' => $record['sum_money'],
-                        'promote_account' => $record['promote_account'],
-                        'op_id_text' => $this->getOpTypeText($record['op_type'], $record['op_id']),
-                        'last_op_id_text' => $this->getOpTypeText($record['last_op_type'], $record['last_op_id']),
-                        'op_type_text' => getPromoteWithdrawOpType($record['op_type']),
-                        'last_op_type_text' => getPromoteWithdrawOpType($record['last_op_type']),
-                        'settlement_type_text' => getPromoteWithdrawSettlementType($record['settlement_type']),
-                        'settlement_begin_time' => $record['settlement_begin_time'] ? date('Y-m-d H:i:s', $record['settlement_begin_time']) : '--',
-                        'settlement_end_time' => date('Y-m-d H:i:s', $record['settlement_end_time']),
-                        'create_time' => date('Y-m-d H:i:s', $record['create_time']),
-                        'status_text' => promoteWithdrawStatus($record['status']),
-                        'respond' => $record['respond'],
-                        'audit_time' => $record['audit_time'] ? date('Y-m-d H:i:s', $record['audit_time']) : '--',
-                    ];
+        } else {
+            $records = D('withdraw')->field($fields)
+                ->where($map)
+                ->order($order)
+                ->page($page, $row)
+                ->select();
+            $count = D('withdraw')->field($fields)
+                ->where($map)
+                ->count();
+        }
+
+        $datas = [];
+        if (!empty($records)) {
+            $promoteIds = array_column($records, 'promote_id');
+            $promoteCompanys = D('promote')->join('tab_promote_company as company on tab_promote.company_id = company.id')
+                ->where(['tab_promote.id' => ['in', $promoteIds]])
+                ->getField('tab_promote.id, company.company_name', true);
+            foreach ($records as $record) {
+                $record['op_id_text'] = $this->getOpTypeText($record['op_type'], $record['op_id']);
+                $record['last_op_id_text'] = $this->getOpTypeText($record['last_op_type'], $record['last_op_id']);
+                $record['op_type_text'] = getPromoteWithdrawOpType($record['op_type']);
+                $record['last_op_type_text'] = getPromoteWithdrawOpType($record['last_op_type']);
+                $record['settlement_type_text'] = getPromoteWithdrawSettlementType($record['settlement_type']);
+                $record['company_name'] = isset($promoteCompanys[$record['promote_id']]) ? $promoteCompanys[$record['promote_id']] : '未知';
+
+                $data = [
+                    'widthdraw_number' => $record['widthdraw_number'],
+                    'sum_money' => $record['sum_money'],
+                    'company_name' => $record['company_name'],
+                    'promote_account' => $record['promote_account'],
+                    'op_id_text' => $this->getOpTypeText($record['op_type'], $record['op_id']),
+                    'last_op_id_text' => $this->getOpTypeText($record['last_op_type'], $record['last_op_id']),
+                    'op_type_text' => getPromoteWithdrawOpType($record['op_type']),
+                    'last_op_type_text' => getPromoteWithdrawOpType($record['last_op_type']),
+                    'settlement_type_text' => getPromoteWithdrawSettlementType($record['settlement_type']),
+                    'settlement_begin_time' => $record['settlement_begin_time'] ? date('Y-m-d H:i:s', $record['settlement_begin_time']) : '--',
+                    'settlement_end_time' => date('Y-m-d H:i:s', $record['settlement_end_time']),
+                    'create_time' => date('Y-m-d H:i:s', $record['create_time']),
+                    'status_text' => promoteWithdrawStatus($record['status']),
+                    'respond' => $record['respond'],
+                    'audit_time' => $record['audit_time'] ? date('Y-m-d H:i:s', $record['audit_time']) : '--',
+                ];
+                if (I('export', 0) != 1) {
+                    $data['id'] = $record['id'];
+                    $data['status'] = $record['status'];
                 }
+                $datas[] = $data;
+            }
 
+            if (I('export', 0) == 1) {
                 $field = [
                     'widthdraw_number' => '结算单号',
                     'sum_money' => '结算金额',
+                    'company_name' => '推广公司',
                     'promote_account' => '推广员账号',
                     'op_id_text' => '操作人',
                     'op_type_text' => '操作人类型',
@@ -1089,17 +1126,11 @@ class QueryController extends ThinkController
                     'respond' => '说明',
                     'audit_time' => '审核时间',
                 ];
-                data2csv($data,"推广结算", $field);
+                data2csv($datas,"推广结算", $field);
                 exit;
             }
         }
 
-        $model = array(
-            'm_name' => 'withdraw',
-            'order' => $order,
-            'title' => '渠道提现',
-            'template_list' => 'withdraw',
-        );
         $map1 = array('status' => ['neq', -1]);
         //为数据权限添加
         setPowerPromoteIds($map1);
@@ -1110,15 +1141,21 @@ class QueryController extends ThinkController
         $this->assign('total', $total);
         $this->assign('ttotal', $ttotal);
         $this->assign('ytotal', $ytotal);
-        $user = A('Bill', 'Event');
 
         $this->m_title = '推广提现';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Query/withdraw', 'status' => 1])->find());
 
+        $page = set_pagination($count, $row);
+        if($page) {
+            $this->assign('_page', $page);
+        }
         //为数据权限添加
         setPowerPromoteIds($map);
+        $companys = getPromoteCompanys();
+        $this->assign('companys', $companys);
         $this->assign('is_admin', is_administrator());
-        $user->money_list($model, $page, $map);
+        $this->assign('list_data', $datas);
+        $this->display();
     }
 
     public function getWithdraw()
@@ -1669,4 +1706,87 @@ class QueryController extends ThinkController
         }
         $this->ajaxReturn(['balance' => $balance]);
     }
+
+    public function autoReview($autoStatus = 0)
+    {
+        if ($_POST) {
+            $promoteIds = I('ids', '');
+            $autoStatus = intval($autoStatus);
+            if (empty($promoteIds)) {
+                $this->error('请选择需要操作的数据');
+            }
+            if (!in_array($autoStatus, [0, 1])) {
+                $this->error('参数错误');
+            }
+
+            $map['id'] = ['in', $promoteIds];
+            $time = time();
+            $save['auto_review_withdraw_status'] = $autoStatus;
+            $save['auto_review_withdraw_updated_time'] = $time;
+
+            $result = D('promote')->where($map)->save($save);
+            if ($result === false) {
+                $this->error('操作失败');
+            } else {
+                $this->success('操作成功');
+            }
+        } else {
+            $page = intval(I('p', 1));
+            $row = intval(I('row', 10));
+            $companyId = intval(I('company_id', 0));
+            $promoteId = intval(I('promote_id', 0));
+            $autoReviewWithdrawStatus = I('status', '');
+
+            if ($companyId > 0) {
+                $map['company_id'] =$companyId;
+            }
+            if ($promoteId > 0) {
+                $map['id'] =$promoteId;
+            }
+            if ($autoReviewWithdrawStatus !== '') {
+                $map['auto_review_withdraw_status'] = $autoReviewWithdrawStatus;
+            }
+            $map['level'] = 1;
+            $field = 'id, account, company_id, auto_review_withdraw_status';
+            $promotes = D('promote')->field($field)
+                ->where($map)
+                ->order('auto_review_withdraw_updated_time desc')
+                ->page($page, $row)
+                ->select();
+            $count = D('promote')->field($field)
+                ->where($map)
+                ->count();
+
+            $companys = getPromoteCompanys();
+            $companyList = array_column($companys, 'company_name', 'id');
+            $promoteList = (new PromoteModel())->getPromotersByLevel();
+
+            $records = [];
+            if (!empty($promotes)) {
+                foreach ($promotes as $promote) {
+                    $promote['company_name'] = $companyList[$promote['company_id']] ?? '未知';
+                    if ($promote['auto_review_withdraw_status'] == 0) {
+                        $className = 'auto-closed';
+                        $text = '关闭';
+                    } else {
+                        $className = 'auto-open';
+                        $text = '开启';
+                    }
+                    $promote['auto_review_withdraw_status_text'] = "<span class='{$className}'>{$text}</span>";
+                    $records[] = $promote;
+                }
+            }
+
+            $page = set_pagination($count, $row);
+            if($page) {
+                $this->assign('_page', $page);
+            }
+            $this->assign('meta_title', '推广提现自动审核管理');
+            $this->assign('records', $records);
+            $this->assign('count', $count);
+            $this->assign('companys', $companys);
+            $this->assign('promoteList', $promoteList);
+            $this->display('auto_review');
+        }
+    }
 }
diff --git a/Application/Admin/Model/WithdrawModel.class.php b/Application/Admin/Model/WithdrawModel.class.php
index d4efe6dd4..e937a96a6 100644
--- a/Application/Admin/Model/WithdrawModel.class.php
+++ b/Application/Admin/Model/WithdrawModel.class.php
@@ -193,7 +193,7 @@ class WithdrawModel extends Model{
         $add['promote_id'] = $promote['id'];
         $add['promote_account'] = $promote['account'];
         $add['create_time'] = $thisTime;
-        $add['status'] = 0;
+        $add['status'] = ($promote['auto_review_withdraw_status'] == 1) ? 1 : 0;
         $add['widthdraw_number'] = D('withdraw')->produceWithdrawNumber(1);
         $add['settlement_begin_time'] = $settlementBeginTime;
         $add['settlement_end_time'] = $settlementEndTime;
@@ -279,9 +279,16 @@ class WithdrawModel extends Model{
                         ->find()['sum_amount'];
                     $sumAmount = $sumAmount ?? 0;
                     foreach ($turnoverRatios as $turnoverRatio) {
-                        if ($sumAmount >= $turnoverRatio['turnover']) {
-                            $ratio = $turnoverRatio['ratio'];
-                            break;
+                        if (empty($turnoverRatio['interval_closed_status']) || $turnoverRatio['interval_closed_status'] == 1) {
+                            if ($sumAmount >= $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
+                        } else {
+                            if ($sumAmount > $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
                         }
                     }
 
@@ -322,7 +329,7 @@ class WithdrawModel extends Model{
         $add['promote_id'] = $promote['id'];
         $add['promote_account'] = $promote['account'];
         $add['create_time'] = $thisTime;
-        $add['status'] = 0;
+        $add['status'] = ($promote['auto_review_withdraw_status'] == 1) ? 1 : 0;
         $add['widthdraw_number'] = D('withdraw')->produceWithdrawNumber(2);
         $add['settlement_begin_time'] = $settlementBeginTime;
         $add['settlement_end_time'] = $settlementEndTime;
@@ -400,9 +407,16 @@ class WithdrawModel extends Model{
                 $sumAmount = $sumAmount ?? 0;
                 $ratio = 0;
                 foreach ($turnoverRatios as $turnoverRatio) {
-                    if ($sumAmount >= $turnoverRatio['turnover']) {
-                        $ratio = $turnoverRatio['ratio'];
-                        break;
+                    if (empty($turnoverRatio['interval_closed_status']) || $turnoverRatio['interval_closed_status'] == 1) {
+                        if ($sumAmount >= $turnoverRatio['turnover']) {
+                            $ratio = $turnoverRatio['ratio'];
+                            break;
+                        }
+                    } else {
+                        if ($sumAmount > $turnoverRatio['turnover']) {
+                            $ratio = $turnoverRatio['ratio'];
+                            break;
+                        }
                     }
                 }
 
@@ -433,7 +447,7 @@ class WithdrawModel extends Model{
         $add['promote_id'] = $promote['id'];
         $add['promote_account'] = $promote['account'];
         $add['create_time'] = $thisTime;
-        $add['status'] = 0;
+        $add['status'] = ($promote['auto_review_withdraw_status'] == 1) ? 1 : 0;
         $add['widthdraw_number'] = D('withdraw')->produceWithdrawNumber(3);
         $add['settlement_begin_time'] = $settlementBeginTime;
         $add['settlement_end_time'] = $settlementEndTime;
@@ -486,9 +500,16 @@ class WithdrawModel extends Model{
                 $sumAmount = $sumAmount ?? 0;
                 $ratio = 0;
                 foreach ($turnoverRatios as $turnoverRatio) {
-                    if ($sumAmount >= $turnoverRatio['turnover']) {
-                        $ratio = $turnoverRatio['ratio'];
-                        break;
+                    if (empty($turnoverRatio['interval_closed_status']) || $turnoverRatio['interval_closed_status'] == 1) {
+                        if ($sumAmount >= $turnoverRatio['turnover']) {
+                            $ratio = $turnoverRatio['ratio'];
+                            break;
+                        }
+                    } else {
+                        if ($sumAmount > $turnoverRatio['turnover']) {
+                            $ratio = $turnoverRatio['ratio'];
+                            break;
+                        }
                     }
                 }
 
@@ -543,9 +564,16 @@ class WithdrawModel extends Model{
                         ->find()['sum_amount'];
                     $sumAmount = $sumAmount ?? 0;
                     foreach ($turnoverRatios as $turnoverRatio) {
-                        if ($sumAmount >= $turnoverRatio['turnover']) {
-                            $ratio = $turnoverRatio['ratio'];
-                            break;
+                        if (empty($turnoverRatio['interval_closed_status']) || $turnoverRatio['interval_closed_status'] == 1) {
+                            if ($sumAmount >= $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
+                        } else {
+                            if ($sumAmount > $turnoverRatio['turnover']) {
+                                $ratio = $turnoverRatio['ratio'];
+                                break;
+                            }
                         }
                     }
 
diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html
index a75a45d7a..ddb97a3c4 100644
--- a/Application/Admin/View/PromoteGameRatio/applyRatio.html
+++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html
@@ -81,8 +81,26 @@
           <table  border="0" cellspacing="0" cellpadding="0">
             <tbody>
             <tr>
-              <td class="l"><i class="mustmark">*</i>会长账号：</td>
+              <td class="l"><i class="mustmark">*</i>推广公司：</td>
               <td class="r">
+                <select name="company_id" id="company_id" class="select_gallery" <notempty name="record">disabled</notempty>>
+                <option value="">推广公司</option>
+                <empty name="record">
+                  <volist name="companys" id="vo">
+                    <option  value="{$vo.id}">{$vo.company_name}</option>
+                  </volist>
+                  <else/>
+                  <volist name="companys" id="vo">
+                    <option value="{$vo.id}" <if condition="$vo['id'] eq $record['company_id']">selected</if> >{$vo.company_name}</option>
+                  </volist>
+                </empty>
+                </select>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
+            <tr>
+              <td class="l"><i class="mustmark">*</i>会长账号：</td>
+              <td class="r promote_id">
                 <select name="promote_id" id="promote_id" class="select_gallery" <notempty name="record">disabled</notempty>>
                   <option value="">会长账号</option>
                   <empty name="record">
@@ -139,14 +157,18 @@
                 <div class="list-ratio">
                   <empty name="record['turnover_ratio']">
                     <div class="li-ratio">
-                      <label>月流水大于等于：</label>
+                      <label class="interval_closed_status_text" style="margin-right: 10px;">月流水</label>
+                      <select name="interval_closed_status[]" style="width: 50px;margin-right: 10px;">
+                        <option value="1">≥</option>
+                        <option value="2">></option>
+                      </select>
                       <div class="turnover">
-                        <input type="text" class="txt" name="turnover[]" value="" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')" style="width: 100px;margin-right: 10px;">
+                        <input type="text" class="txt" name="turnover[]" value="" placeholder="请输入金额" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')" style="width: 100px;margin-right: 10px;">
                         <span></span>
                       </div>
                       <label>分成比例：</label>
                       <div class="turnover-ratio">
-                        <input type="text" class="txt" name="turnover_ratio[]" value="" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')" style="width: 60px;">
+                        <input type="text" class="txt" name="turnover_ratio[]" value="" placeholder="请输入比例" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')" style="width: 60px;">
                         <span class="form_unit" style="margin-right: 10px;">%</span>
                         <span class="error-message">sadasdas</span>
                       </div>
@@ -156,7 +178,11 @@
                     <else/>
                     <volist name="record['turnover_ratio']" key="key" id="vo">
                       <div class="li-ratio">
-                        <label>月流水大于等于：</label>
+                        <label class="interval_closed_status_text" style="margin-right: 10px;">月流水</label>
+                        <select name="interval_closed_status[]" style="width: 50px;margin-right: 10px;">
+                          <option value="1" <if condition="empty($vo['interval_closed_status']) or $vo['interval_closed_status'] eq 1">selected</if>>≥</option>
+                          <option value="2" <if condition="!empty($vo['interval_closed_status']) and $vo['interval_closed_status'] eq 2">selected</if>>></option>
+                        </select>
                         <div class="turnover">
                           <input type="text" class="txt" name="turnover[]" value="{$vo['turnover']|default=''}" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')" style="width: 100px;margin-right: 10px;">
                           <span></span>
@@ -259,6 +285,30 @@ $(function(){
     promoteGameRatioData.end_time = '';
     promoteGameRatioData.remark = '';
 
+    $('#company_id').change(function (e) {
+        var companyId = parseInt($(this).val());
+        $.ajax({
+            type: 'post',
+            url: "{:U('getPromotes')}",
+            dataType: 'json',
+            data: {'company_id': companyId},
+            success: function (data) {
+                var html = '<option value="" selected>会长账号</option>';
+                if (data.length > 0) {
+                    for (let i = 0;i < data.length;i++) {
+                        html += '<option value="' + data[i]['id'] + '">' + data[i]['account'] + '(' + data[i]['real_name'] + ')' + '</option>';
+                    }
+                }
+                $('#promote_id').html(html);
+                $('#promote_id').select2();
+                getPromoteGameRatio();
+            },
+            error: function (result) {
+                console.log(result);
+            }
+        });
+    });
+
     $('#ratio, #begin_time, #end_time, #remark').change(function () {
         var val = $(this).val();
         var elementIdName = $(this).attr('id');
@@ -266,13 +316,14 @@ $(function(){
     });
 
     $('#promote_id, #game_id').change(function () {
-        var promoteId = parseInt($('#promote_id').val());
-        var gameId = parseInt($('#game_id').val());
-        getPromoteGameRatio(promoteId, gameId);
+        getPromoteGameRatio();
     });
 
-    function getPromoteGameRatio(promoteId, gameId)
+    function getPromoteGameRatio()
     {
+        var promoteId = parseInt($('#promote_id').val());
+        var gameId = parseInt($('#game_id').val());
+
         $.ajax({
             type: 'post',
             url: "{:U('getPromoteGameRatio')}",
@@ -340,14 +391,18 @@ $(function(){
         var delBtn = $('.iconfont-btn-del');
         var html = '';
         html += '<div class="li-ratio">';
-        html += '<label>月流水大于等于：</label>';
+        html += '<label class="interval_closed_status_text">月流水：</label>';
+        html += '<select name="interval_closed_status[]" style="width: 50px;margin-right: 10px;">';
+        html += '<option value="1">≥</option>';
+        html += '<option value="2">></option>';
+        html += '</select>';
         html += '<div class="turnover">';
-        html += '<input type="text" class="txt" name="turnover[]" value="" placeholder="" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 100px;margin-right: 10px;">';
+        html += '<input type="text" class="txt" name="turnover[]" value="" placeholder="请输入金额" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 100px;margin-right: 10px;">';
         html += '<span></span>';
         html += '</div>';
         html += '<label>分成比例：</label>';
         html += '<div class="turnover-ratio">';
-        html += '<input type="text" class="txt" name="turnover_ratio[]" value="" placeholder="" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 60px;">';
+        html += '<input type="text" class="txt" name="turnover_ratio[]" value="" placeholder="请输入比例" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 60px;">';
         html += '<span class="form_unit" style="margin-right: 10px;">%</span>';
         html += '<span class="error-message"></span>';
         html += '</div>';
diff --git a/Application/Admin/View/PromoteGameRatio/lists.html b/Application/Admin/View/PromoteGameRatio/lists.html
index a9cb1d8f5..5d0461650 100644
--- a/Application/Admin/View/PromoteGameRatio/lists.html
+++ b/Application/Admin/View/PromoteGameRatio/lists.html
@@ -72,6 +72,21 @@
             <div class="input-list search-title-box">
                 <label>搜索：</label>
             </div>
+            <div class="input-list input-list-game search_label_rehab">
+                <select id="company_id" name="company_id" class="select_gallery" >
+                    <option value="">推广公司</option>
+                    <volist name="companys" id="vo">
+                        <option value="{$vo.id}">{$vo.company_name}</option>
+                    </volist>
+                </select>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="company_belong" name="company_belong" class="select_gallery" >
+                    <option value="">内外团</option>
+                    <option value="0" <if condition="0 eq I('company_belong', '') and '' nheq I('company_belong', '')">selected</if>>内团</option>
+                    <option value="1" <if condition="1 eq I('company_belong', '')">selected</if>>外团</option>
+                </select>
+            </div>
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="promote_id" name="promote_id" class="select_gallery" >
                     <option value="">推广员账号</option>
@@ -80,6 +95,14 @@
                     </volist>
                 </select>
             </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="game_type_id" name="game_type_id" class="select_gallery" >
+                    <option value="">游戏类型</option>
+                    <volist name="gameTypeList" id="vo">
+                        <option value="{$vo.id}" <if condition="$vo.id eq I('game_type_id')">selected</if> >{$vo.type_name}</option>
+                    </volist>
+                </select>
+            </div>
             <div class="input-list input-list-game search_label_rehab">
                 <select id="game_id" name="game_id" class="select_gallery" >
                     <option value="">游戏名称</option>
@@ -88,7 +111,7 @@
                     </volist>
                 </select>
             </div>
-            <div class="input-list input-list-game search_label_rehab">
+            <div class="input-list input-list-promote search_label_rehab">
                 <select id="status" name="status" class="select_gallery" >
                     <option value="">审核状态</option>
                     <?php foreach ($statusList as $key => $status) :?>
@@ -117,9 +140,12 @@
                     <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>
@@ -153,9 +179,16 @@
                             <td>{$record.promote_create_time}</td>
                             <td>{$record.promote_status_text}</td>
                             <td>{$record.promote_ver_status_text}</td>
+                            <td>{$record.company_name}</td>
+                            <td>{$record.company_belong}</td>
                             <td>{$record.game_name}</td>
+                            <td>{$record.game_type_name}</td>
                             <td>{$record.last_ratio}</td>
-                            <td>{$record.ratio}</td>
+                            <td style="line-height: 16px;text-indent: 0;">
+                                <div style="text-align: left;width: 90%;margin-left: 5%;margin-top: 10px;margin-bottom: 10px;">
+                                    {$record.ratio_dtl}
+                                </div>
+                            </td>
                             <td>{$record.valid_date}</td>
                             <td>{$record.remark}</td>
                             <td>{$record.status_text}</td>
diff --git a/Application/Admin/View/Query/auto_review.html b/Application/Admin/View/Query/auto_review.html
new file mode 100644
index 000000000..9daee06bf
--- /dev/null
+++ b/Application/Admin/View/Query/auto_review.html
@@ -0,0 +1,233 @@
+<extend name="Public/base"/>
+<block name="css">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+    <link rel="stylesheet" href="__CSS__/promote.css" type="text/css"/>
+    <link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
+    <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;}
+        .textarea-style {
+            width: 200px;
+            height: 80px;
+            border-radius: 5px;
+            padding: 5px;
+        }
+        .mustmark {
+            color: #FF0000;
+            font-style: normal;
+            margin: 0 3px;
+        }
+        .auto-closed {
+            border: 0 solid;
+            border-radius: 3px;
+            background-color: #999;
+            color: #fff;
+            padding: 5px 10px;
+        }
+        .auto-open {
+            border: 0 solid;
+            border-radius: 3px;
+            background-color: #4bbd00;
+            color: #fff;
+            padding: 5px 10px;
+        }
+    </style>
+</block>
+<block name="body">
+    <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="__JS__/jquery.form.js"></script>
+    <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
+
+    <script src="__STATIC__/md5.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="__STATIC__/webuploader/webuploader.js"></script>
+    <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
+    <div class="cf main-place top_nav_list navtab_list">
+        <h3 class="page_title">{$meta_title}</h3>
+        <p class="description_text">说明：推广员提现自动审核管理</p>
+
+    </div>
+    <div class="cf top_nav_list">
+        <empty name="model.extend">
+            <div class="fl button_list">
+                <div class="tools">
+                    <a class="ajax-post" target-form="ids" url="{:U('autoReview',array('autoStatus' => 1))}"><span class="button_icon button_icon1"></span>开启自动审核</a>
+                    <a class="ajax-post" target-form="ids" url="{:U('autoReview',array('autoStatus' => 0))}"><span class="button_icon button_icon2"></span>关闭自动审核</a>
+                </div>
+            </div>
+        </empty>
+        <!-- 高级搜索 -->
+        <div class="jssearch fl cf search_list">
+            <div class="input-list search-title-box">
+                <label>搜索：</label>
+            </div>
+            <div class="input-list input-list-game search_label_rehab">
+                <select id="company_id" name="company_id" class="select_gallery" >
+                    <option value="">推广公司</option>
+                    <volist name="companys" id="vo">
+                        <option value="{$vo.id}">{$vo.company_name}</option>
+                    </volist>
+                </select>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="promote_id" name="promote_id" class="select_gallery">
+                    <option value="">推广员账号</option>
+                    <volist name="promoteList" id="vo">
+                        <option value="{$vo.id}">{$vo.account}({$vo.real_name})</option>
+                    </volist>
+                </select>
+            </div>
+            <div class="input-list search_label_rehab">
+                <select name="status" class="select_gallery" style="width:120px;">
+                    <option value="">自动审核</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('Query/autoReview','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
+                <a class="sch-btn" style="background-color: #999;" href="{:U('withdraw')}" >返回</a>
+            </div>
+            <!-- <div class="input-list">
+                <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>12,),I('get.')))}">导出</a>
+            </div> -->
+        </div>
+    </div>
+
+    <!-- 数据列表 -->
+    <div class="data_list">
+        <div class="">
+            <table>
+                <!-- 表头 -->
+                <thead>
+                <tr>
+                    <th>
+                        <input class="check-all" type="checkbox">
+                    </th>
+                    <th>推广公司</th>
+                    <th>推广员账号</th>
+                    <th>自动审核</th>
+<!--                    <th>操作</th>-->
+                </tr>
+                </thead>
+
+                <!-- 列表 -->
+                <tbody>
+                <empty name ="records">
+                    <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
+                    <else />
+                    <volist name="records" id="record">
+                        <tr>
+                            <td>
+                                <input class="ids" type="checkbox" value="{$record['id']}" name="ids[]">
+                            </td>
+                            <td>{$record.company_name}</td>
+                            <td>{$record.account}</td>
+                            <td>{$record.auto_review_withdraw_status_text}</td>
+                        </tr>
+                    </volist>
+                </empty>
+                <tr class="data_summary">
+                    <td>汇总</td>
+                    <td colspan="99">累计提现：{:null_to_0(floor($total*100)/100)}元</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="page">
+        <if condition="$is_admin eq true ">
+            <a class="sch-btn export-btn"
+               href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
+        {$_page|default=''}
+    </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="Query/withdraw">
+        </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">
+    <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 src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></script>
+    <script src="__STATIC__/jquery.cookie.js" charset="utf-8"></script>
+    <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>
+        $(".select_gallery").select2();
+    </script>
+    <script type="text/javascript">
+        //导航高亮
+        highlight_subnav('{:U('Query/withdraw')}');
+        $(function(){
+            $(".paixu").click(function(){
+                var that=$(this);
+                $data_order=that.attr('data-order');
+                $order_type='{$userarpu_order}';
+                console.log($order_type);
+                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();
+                }
+            });
+            //搜索功能
+            $("#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;
+                }
+                window.location.href = url;
+            });
+            //回车自动提交
+            $('.jssearch').find('input').keyup(function(event){
+                if(event.keyCode===13){
+                    $("#search").click();
+                }
+            });
+        });
+    </script>
+</block>
diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html
index 6bf163db9..afb677218 100644
--- a/Application/Admin/View/Query/withdraw.html
+++ b/Application/Admin/View/Query/withdraw.html
@@ -58,6 +58,7 @@
                 <div class="tools">
                     <a class="ajax-post" target-form="ids" url="{:U('set_withdraw_status')}"><span class="button_icon button_icon12"></span>通 过</a>
                     <a class="agree" data-id="ids"><span class="button_icon button_icon13"></span>驳 回</a>
+                    <a href="{:U('autoReview')}"><span class="button_icon button_icon9 "></span>自动审核管理</a>
                 </div>
             </div>
         </empty>
@@ -66,6 +67,14 @@
             <div class="input-list search-title-box">
                 <label>搜索：</label>
             </div>
+            <div class="input-list input-list-game search_label_rehab">
+                <select id="company_id" name="company_id" class="select_gallery" >
+                    <option value="">推广公司</option>
+                    <volist name="companys" id="vo">
+                        <option value="{$vo.id}">{$vo.company_name}</option>
+                    </volist>
+                </select>
+            </div>
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="promote_id" name="promote_account" class="select_gallery" style="width:120px;">
                     <option value="">推广员账号</option>
@@ -123,6 +132,7 @@
                     </th>
                     <th>提现单号</th>
                     <th><a class="paixu" data-order='sum_money'>提现金额</a></th>
+                    <th>推广公司</th>
                     <th>推广员账号</th>
                     <th>操作人</th>
                     <th>操作人类型</th>
@@ -158,41 +168,19 @@
                             </td>
                             <td>{$data.widthdraw_number}</td>
                             <td onclick="details('{$data["id"]}')"><span class="money_color">{$data.sum_money}</span></td>
-                            <td>
-                                <!--<if condition="$is_admin eq true ">
-                                    {:get_promote_name($data['promote_id'])}
-                                    <else />
-                                    {:encryptStr(get_promote_name($data['promote_id']))}
-                                </if>-->
-                                {:get_promote_name($data['promote_id'])}
-                            </td>
-                            <td>
-                                <if condition="$data.op_type eq 1">
-                                    {:get_promote_name($data['op_id'])}
-                                    <elseif condition="$data.op_type eq 2"/>
-                                    {:getAdminNickname($data['op_id'])}
-                                    <else/>
-                                    自动
-                                </if>
-                            </td>
-                            <td>{:getPromoteWithdrawOpType($data['op_type'])}</td>
-                            <td>
-                                <if condition="$data.last_op_type eq 1">
-                                    {:get_promote_name($data['last_op_id'])}
-                                    <elseif condition="$data.last_op_type eq 2"/>
-                                    {:getAdminNickname($data['last_op_id'])}
-                                    <else/>
-                                    自动
-                                </if>
-                            </td>
-                            <td>{:getPromoteWithdrawOpType($data['last_op_type'])}</td>
-                            <td>{:getPromoteWithdrawSettlementType($data['settlement_type'])}</td>
-                            <td><notempty name="data.settlement_begin_time">{$data.settlement_begin_time|date='Y-m-d H:i:s',###}<else />---</notempty></td>
-                            <td><notempty name="data.settlement_end_time">{$data.settlement_end_time|date='Y-m-d H:i:s',###}<else />---</notempty></td>
-                            <td><notempty name="data.create_time">{$data.create_time|date='Y-m-d H:i:s',###}<else />---</notempty></td>
-                            <td><span <if condition="$data['status'] == -2">style="color: #999;"</if>>{:promoteWithdrawStatus($data['status'])}</span></td>
+                            <td>{$data.company_name}</td>
+                            <td>{$data.promote_account}</td>
+                            <td>{$data.op_id_text}</td>
+                            <td>{$data.op_type_text}</td>
+                            <td>{$data.last_op_id_text}</td>
+                            <td>{$data.last_op_type_text}</td>
+                            <td>{$data.settlement_type_text}</td>
+                            <td>{$data.settlement_begin_time}</td>
+                            <td>{$data.settlement_end_time}</td>
+                            <td>{$data.create_time}</td>
+                            <td>{$data.status_text}</td>
                             <td>{$data.respond}</td>
-                            <td><notempty name="data.audit_time">{$data.audit_time|date='Y-m-d H:i:s',###}<else />---</notempty></td>
+                            <td>{$data.audit_time}</td>
                             <td>
                                 <div class="partakebtn">
                                     <if condition="$data.status eq 0">
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index 5f064edc8..a104b86c1 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1455,3 +1455,21 @@ function getPromoteWithdrawSettlementType($type = null)
         return Admin\Model\WithdrawModel::$settlementTypeList;
     }
 }
+
+//获取推广公司列表
+function getPromoteCompanys()
+{
+    return M('promote_company', 'tab_')->field('id, company_name')->where(['status' => 1])->select();
+}
+
+function getPromoteCompanyName($companyId)
+{
+    $companyName = M('promote_company', 'tab_')->where(['id' => $companyId])->getField('company_name');
+
+    return $companyName ?? '未知';
+}
+
+function getGameTypes()
+{
+    return M('game_type', 'tab_')->field('id, type_name')->where(['status' => 1])->select();
+}
\ No newline at end of file
diff --git a/Data/update.sql b/Data/update.sql
index 83659997d..f27c9bf92 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1105,3 +1105,11 @@ ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显
 --CP分成比例添加运算符字段  2020-02-04 郑昌隆
 ALTER TABLE `tab_cp_game_ratio`
 ADD COLUMN `instanceof` tinyint(2) NOT NULL DEFAULT 1 COMMENT '运算符（1:>= ; 2:>）' AFTER `game_id`;
+
+-- 2020-02-04
+ALTER TABLE `tab_promote`
+ADD COLUMN `auto_review_withdraw_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '提现自动审核状态：0-关闭 1-开启';
+ALTER TABLE `tab_promote`
+ADD COLUMN `auto_review_withdraw_updated_time` int(10) NOT NULL DEFAULT 0 COMMENT '提现自动审核状态更新时间';
+ALTER TABLE `tab_promote`
+ADD INDEX `auto_review_withdraw_status`(`auto_review_withdraw_status`) USING BTREE;