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] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98>=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86>?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=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 = "
"; + } foreach ($thisTurnoverRatios as $thisTurnoverRatio) { $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥'; - $thisRatioDtl .= "
月流水{$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) ? '' . $thisStatusText . '' : $thisStatusText; + if (I('export', 0) == 1) { + $thisStatusText = ($promoteGameRatio['status'] == -1) ? $thisStatusText : $thisStatusText; + } else { + $thisStatusText = ($promoteGameRatio['status'] == -1) ? '' . $thisStatusText . '' : $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 = []; }