From e3b53e7df1cf44298f28e9c306075c0c99513fd4 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Sun, 28 Jun 2020 21:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancePromoteController.class.php           | 15 +++++++++++++--
 .../FinancePromote/gameStatisticsDetail.html     | 16 ++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index cefe9beec..6ab66b643 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -628,6 +628,10 @@ class FinancePromoteController extends AdminController
             $map['pay_order_number'] = $_REQUEST['pay_order_number'];
         }
 
+        if (!empty($_REQUEST['admin_id'])) {
+            $map['market_admin_id'] = $_REQUEST['admin_id'];
+        }
+
         /* if (!empty(I('develop_type'))) {
             $map['company.develop_type'] = I('develop_type');
         }
@@ -675,7 +679,7 @@ class FinancePromoteController extends AdminController
         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,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,market_admin_id";
         $group = "";
         $order = "pay_time DESC";
         if(isset($_REQUEST['export'])){
@@ -683,16 +687,23 @@ class FinancePromoteController extends AdminController
         }else {
             $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
         }
+
+        $marketAdmins = [];
+        if (count($data) > 0) {
+            $marketAdmins = getAdminUsernameList(array_column($data, 'market_admin_id'));
+        }
+
         foreach($data as $key => $value) {
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
             $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
             $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
-
+            $data[$key]['market_admin_username'] = $marketAdmins[$value['market_admin_id']] ?? '无';
             if (isset($_REQUEST['export'])) {
                 checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail');
             }
 
         }
+
         if (isset($_REQUEST['export'])) {
 
             $GetData = $_GET;
diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html
index 7e365faa0..0e50b5cb1 100644
--- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html
+++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html
@@ -102,15 +102,6 @@
           <?php endforeach;?>
         </select>
       </div>
-
-      <div class="input-list input-list-server search_label_rehab">
-        <select id="develop_type" name="develop_type" class="select_gallery"  style="width:120px;">
-          <option value="">请选择开发类型</option>
-          <?php foreach(getCompanyDevelopTypes() as $key => $value):?>
-          <option value="<?=$key?>" <?php if($key == I('develop_type')):?>selected<?php endif;?>><?=$value?></option>
-          <?php endforeach;?>
-        </select>
-      </div>
       <input type="hidden" name="promote_type" value="{$_GET['promote_type']}"/>
       <input type="hidden" name="company_id" value="{$_GET['company_id']}"/>
       <input type="hidden" name="company_belong" value="{$_GET['company_belong']}"/>
@@ -183,7 +174,7 @@
           <th >设备名称</th>
 
           <th >所属推广员</th>
-
+          <th >所属市场专员</th>
           <th >充值ip</th>
 
           <th >游戏区服</th>
@@ -206,7 +197,7 @@
         </style>
                 <if condition = "empty($data)">
                   <tr>
-                    <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
                   </tr>
                 </if>
         <notemtpy name = "data">
@@ -218,6 +209,7 @@
               <td >{$data.game_name}</td>
               <td >{$data.sdk_version}</td>
               <td >{$data.promote_account}</td>
+              <td >{$data.market_admin_username}</td>
               <td >{$data.spend_ip}</td>
               <td >{$data.server_name}</td>
               <td >{$data.game_player_name}</td>
@@ -228,7 +220,7 @@
           </volist>
           <tr>
             <td ><span>总计</span></td>
-            <td colspan="11" ><span><if condition="$sumAll neq ''">累计充值：{$sumAll}<else/>0</if>
+            <td colspan="12" ><span><if condition="$sumAll neq ''">累计充值：{$sumAll}<else/>0</if>
             （现金金额：{$sumCash} 平台币：{$sumBalance} 绑币：{$sumInside}）
             </span></td>
           </tr>