diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 6e8567c9e..b641c30cf 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2426,7 +2426,7 @@ class ExportController extends Controller } - $orderData = M('test_order', 'tab_')->where($map)->page($page,$row)->order('add_time desc')->select(); + $orderData = M('test_order', 'tab_')->where($map)->order('add_time desc')->select(); $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); $xlsData = []; @@ -7625,6 +7625,7 @@ class ExportController extends Controller $xlsData = D("spend")->gameStatistics($map); foreach ($xlsData as $key => $value) { + $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'(')); $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count']; if ($value['sdk_version'] == 1) { $xlsData[$key]['sdk_version'] = '安卓'; diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 4d78b4460..3929848e2 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -349,17 +349,17 @@ 当前用户累计充值:{$now_count}    历史累计充值:{$history_count}   用户数:{$user_count}   - 去充用户数:{$device_count} + 去重用户数:{$device_count} 当前用户累计充值: 当前属于该推广员的用户的充值累计(不含用户换绑前记录)  /   历史累计充值: 历史中属于该推广员的用户的充值累计(含用户换绑前记录)   - 去充用户数:{$device_count} + 去重用户数:{$device_count} 当前用户累计充值:{$now_count}  用户数:{$user_count}   - 去充用户数:{$device_count} + 去重用户数:{$device_count} diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 9541e2c70..117f7f88b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3283,7 +3283,7 @@ class DownloadController extends BaseController { $promoteGroup = isset($promotes[$list['promote_id']]) ? $promoteService->getGroupNameByChain($promotes[$list['promote_id']]['chain'], $list['promote_id']) : ''; $csvData["pay_order_number"] = $list["pay_order_number"]; - $csvData["game_name"] = substr($list["game_name"],0,strrpos($list["game_name"],'(')); + $csvData["game_name"] = $list["game_name"]; $csvData["user_account"] = $list["user_account"]; $csvData["promote_account"] = $list["promote_account"] . ($promoteGroup == '' ? '' : '(' . $promoteGroup . ')'); $csvData["pay_amount"] = $list["pay_amount"];