From f05034486cddb273b11e2d944c8bf0c1d3d00735 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 12 Dec 2019 17:58:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 72c11f272..a041e3bb4 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1856,7 +1856,7 @@ class QueryController extends BaseController
             }
 
             $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
-            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
+            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
             $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
 
             $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
@@ -1884,6 +1884,10 @@ class QueryController extends BaseController
             list($records, $pagination, $count) = $this->paginate($query);
 
             foreach ($records as &$list) {
+                if (empty($list['user_account']) ) {
+                    $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
+                    $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                }
                 $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);

From 65b5fc4a26c536f27237c675760dc671fb90afbb Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Thu, 12 Dec 2019 18:01:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E5=88=97=E8=A1=A8=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Spend/lists.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 4c52357aa..ea64fb7c6 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -169,7 +169,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name="list_data">
-                    <td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="17" class="text-center">aOh! 暂时还没有内容!</td>
                     <else/>
                     <volist name="list_data" id="data">
                         <tr>
@@ -212,7 +212,6 @@
                                 </if>
                             </td>
                             <td style="text-indent:0;">
-
                                 <if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 1">
                                     <a class=" budan" href="javascript:void(0);"
                                        href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
@@ -227,19 +226,17 @@
                     </volist>
                 </empty>
                 <tr class="data_summary">
-
-
                     <td>汇总</td>
-                    <td colspan="6">
+                    <td colspan="16">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
-                        今日充值：{$ttotal}
-                        昨日充值：{$ytotal}
+                       <!-- 今日充值：{$ttotal}-->
+                       <!-- 昨日充值：{$ytotal}-->
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td colspan="99" style="color: #a9a9a9;">
+                    <!--<td colspan="99" style="color: #a9a9a9;">
                         今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
                         昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
-                    </td>
+                    </td>-->
                 </tr>
                 </tbody>
             </table>