From 2dc69ac892a1242d4018374e62ff0059c226d782 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 30 Oct 2020 17:52:13 +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
---
.../Home/Controller/DownloadController.class.php | 12 ++++++------
.../Home/Controller/PlayersController.class.php | 4 ++--
.../Home/Controller/QueryController.class.php | 3 +--
.../Home/View/default/Players/playAction.html | 9 +--------
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 5f78a0865..30c0e0a55 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -2975,7 +2975,7 @@ public function iosDetailExcelInfo($id,$map) {
public function playactionExcelInfo($id,$map) {
$xlsName = "玩家行为日志";
$xlsCell = array(
- 'cp订单号',
+ // 'cp订单号',
'充值时间',
'玩家账号',
'游戏名称',
@@ -2986,7 +2986,7 @@ public function iosDetailExcelInfo($id,$map) {
'订单金额'
);
$model = M('pay_info','tab_');
- $data1 = $model->field('id')->where($map)->select();
+ $count = M('pay_info','tab_')->field('id')->where($map)->count();
$csvFileName = $xlsName.'.csv';
//设置好告诉浏览器要下载excel文件的headers
header('Content-Description: File Transfer');
@@ -2999,7 +2999,7 @@ public function iosDetailExcelInfo($id,$map) {
mb_convert_variables('gb2312', 'UTF-8', $xlsCell);
fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中
$accessNum = '100000';//从数据库获取总量，假设是十万
- $accessNum = count($data1)?:0 ;
+ $accessNum = $count ?? 0;
$perSize = 5000;//每次查询的条数
$pages = ceil($accessNum / $perSize);
for($i = 1; $i <= $pages; $i++) {
@@ -3012,10 +3012,10 @@ public function iosDetailExcelInfo($id,$map) {
$gameId = $v['game_id'];
$serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find();
$v['promote_id']= $promoteInfo['account'];
- if(empty($v['extend'])) {
+ /* if(empty($v['extend'])) {
$v['extend'] = $v['order_id'];
- }
- $csvData['extend'] = $this->encryption($v['extend']);
+ } */
+ // $csvData['extend'] = $this->encryption($v['extend']);
$csvData['create_time'] = $v['create_time'];
$csvData['user_account'] = $this->encryption($v['user_account']);
$csvData['game_name'] = $v['game_name'];
diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php
index edb710fc6..084892366 100644
--- a/Application/Home/Controller/PlayersController.class.php
+++ b/Application/Home/Controller/PlayersController.class.php
@@ -98,8 +98,8 @@ class PlayersController extends BaseController {
$count = M('pay_info', 'tab_')
->field('tab_pay_info.id')
->where($map)
- ->select();
- $count = count($count);
+ ->count();
+ $count = intval($count);
//分页
$parameter['p'] = $page;
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 611b13522..b2c0de4b5 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -288,7 +288,6 @@ class QueryController extends BaseController
->where($map)
->count();
}
-
if (!empty($data)) {
foreach ($data as &$list) {
$loginMap['user_id'] = $list['id'];
@@ -297,7 +296,7 @@ class QueryController extends BaseController
->where($loginMap)
->order('login_time desc')
->find();
-
+
$list['new_login_time'] = date('Y-m-d H:i:s', $newLoginData['login_time']);
$list['new_login_ip'] = $newLoginData['login_ip'];
$list['account'] = substr($list['account'], 0, 2) . '******' . substr($list['account'], 8);
diff --git a/Application/Home/View/default/Players/playAction.html b/Application/Home/View/default/Players/playAction.html
index 40002effa..459576388 100644
--- a/Application/Home/View/default/Players/playAction.html
+++ b/Application/Home/View/default/Players/playAction.html
@@ -130,12 +130,6 @@
-
-
-
-
-