elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
master
sunke 5 years ago
parent b81842e6e0
commit 389ef7e967
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

3
Application/Admin/Controller/ExportController.class.php
Unescape Escape View File

@ -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_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(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find();
$xlsData = []; $xlsData = [];
@ -7625,6 +7625,7 @@ class ExportController extends Controller
$xlsData = D("spend")->gameStatistics($map); $xlsData = D("spend")->gameStatistics($map);
foreach ($xlsData as $key => $value) { 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']; $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
if ($value['sdk_version'] == 1) { if ($value['sdk_version'] == 1) {
$xlsData[$key]['sdk_version'] = '安卓'; $xlsData[$key]['sdk_version'] = '安卓';

6
Application/Admin/View/Member/user_info.html
Unescape Escape View File

@ -349,17 +349,17 @@
当前用户累计充值：{$now_count} 　　 当前用户累计充值：{$now_count} 　　
历史累计充值:{$history_count}　　 历史累计充值:{$history_count}　　
用户数:{$user_count}　　 用户数:{$user_count}　　
去充用户数:{$device_count} 去重用户数:{$device_count}
</td> </td>
<td colspan="8" style="font-style: 12px;color: #a9a9a9;text-align: center;"> <td colspan="8" style="font-style: 12px;color: #a9a9a9;text-align: center;">
当前用户累计充值:&#12288;当前属于该推广员的用户的充值累计（不含用户换绑前记录）&#12288;&#12288;/&#12288;&#12288; 当前用户累计充值:&#12288;当前属于该推广员的用户的充值累计（不含用户换绑前记录）&#12288;&#12288;/&#12288;&#12288;
历史累计充值:&#12288;历史中属于该推广员的用户的充值累计（含用户换绑前记录）&#12288;&#12288; 历史累计充值:&#12288;历史中属于该推广员的用户的充值累计（含用户换绑前记录）&#12288;&#12288;
去充用户数:{$device_count} 去重用户数:{$device_count}
</td> </td>
<else /> <else />
<td colspan="99"> <td colspan="99">
当前用户累计充值：{$now_count}&#12288;&#12288;用户数:{$user_count}&#12288;&#12288; 当前用户累计充值：{$now_count}&#12288;&#12288;用户数:{$user_count}&#12288;&#12288;
去充用户数:{$device_count} 去重用户数:{$device_count}
</td> </td>
</if> </if>

Write Preview
Loading…
Cancel
Save