解决冲突

master
ELF 5 years ago
commit b81842e6e0

@ -7626,7 +7626,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]['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'] = '安卓';
} else if ($value['sdk_version'] == 2) { } else if ($value['sdk_version'] == 2) {
$xlsData[$key]['sdk_version'] = '苹果'; $xlsData[$key]['sdk_version'] = '苹果';

Loading…
Cancel
Save