From 319dde1090040ed882e0ae0be98101d242827ce2 Mon Sep 17 00:00:00 2001
From: liuweiwen <529520975@qq.com>
Date: Tue, 11 Feb 2020 15:05:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/StatementMangementController.class.php  |  3 +++
 .../View/StatementMangement/rewardManageList.html      | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index 6532fb38c..5cadcf02b 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -242,6 +242,9 @@ class StatementMangementController extends ThinkController
         if (!empty(I('partner_id'))) {
             $map['company_id'] = I('partner_id');
         }
+        if (strlen(I('company_type'))) {
+            $map['company_type'] = I('company_type');
+        }
         if (!empty(I('account'))) {
             $map['accounts'] = ['like', '%' . I('account') . '%'];
         }
diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html
index 6b79eaee0..064f94ca5 100644
--- a/Application/Admin/View/StatementMangement/rewardManageList.html
+++ b/Application/Admin/View/StatementMangement/rewardManageList.html
@@ -64,7 +64,15 @@
 
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list">
-            <!--游戏类型搜索END-->
+            <!--公司类型搜索END-->
+            <div class="input-list input-list-server search_label_rehab">
+                <select id="company_type" name="company_type" class="select_gallery"  style="width:120px;">
+                    <option value="">请选择公司类型</option>
+                    <option  value="1" <if condition="'0' eq $_GET['company_type']">selected=selected</if>>上游公司</option>
+                    <option  value="2" <if condition="'1' eq $_GET['company_type']">selected=selected</if>>下游公司</option>
+                </select>
+            </div>
+            <!--合作公司搜索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>

From 66d68b0b49c2aa12e3f1464214a1920c1d712442 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 11 Feb 2020 15:52:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98>=E7=BB=93=E7=AE=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86>=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteGameRatioController.class.php       | 18 +++++++++++++++---
 .../Controller/PromoteController.class.php     |  8 ++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index c55fb6c5a..110270c14 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -116,14 +116,23 @@ class PromoteGameRatioController extends ThinkController
                 $thisTurnoverRatios = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : [];
                 $thisRatioDtl = "默认：{$promoteGameRatio['ratio']}%";
                 if ($thisTurnoverRatios) {
+                    if (I('export', 0) == 1) {
+                        $symbol = "\n";
+                    } else {
+                        $symbol = "<br>";
+                    }
                     foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
                         $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
-                        $thisRatioDtl .= "<br>月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
+                        $thisRatioDtl .= "{$symbol}月流水{$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;
+                if (I('export', 0) == 1) {
+                    $thisStatusText = ($promoteGameRatio['status'] == -1) ? $thisStatusText : $thisStatusText;
+                } else {
+                    $thisStatusText = ($promoteGameRatio['status'] == -1) ? '<span style="color: red;">' . $thisStatusText . '</span>' : $thisStatusText;
+                }
                 $thisApplicant = get_admin_account($promoteGameRatio['applicant_id']);
                 $thisReviewer = $promoteGameRatio['reviewer_id'] ? get_admin_account($promoteGameRatio['reviewer_id']) : '待确认';
                 $thisBeninTime = date('Y/m', $promoteGameRatio['begin_time']);
@@ -181,9 +190,12 @@ class PromoteGameRatioController extends ThinkController
                 'promote_create_time' => '注册时间',
                 'promote_status_text' => '状态',
                 'promote_ver_status_text' => '身份状态',
+                'company_name' => '推广公司',
+                'company_belong' => '工会归属',
                 'game_name' => '已申请游戏',
+                'game_type_name' => '游戏类型',
                 'last_ratio' => '原分成比例',
-                'ratio' => '当前分成比例',
+                'ratio_dtl' => '公会阶梯比例详细信息',
                 'valid_date' => '开始时间',
                 'remark' => '备注',
                 'status_text' => '分成比例审核',
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index af6d64798..0f8f85afd 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -239,10 +239,10 @@ class PromoteController extends BaseController
             $weekArray = [7,1,2,3,4,5,6];
             $week = $weekArray[date("w")];
             $match_rules = M("document_pop_rules")
-            ->field('id')
-            ->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
-            ->order("sort asc, id desc")
-            ->select();
+                ->field('id')
+                ->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
+                ->order("sort asc, id desc")
+                ->select();
         } else {
             $match_rules = [];
         }