master
ELF 3 years ago
parent aae5ffd999
commit f609c6061a

@ -4568,7 +4568,7 @@ public function iosDetailExcelInfo($id,$map) {
'玩家账号', '玩家账号',
'游戏订单', '游戏订单',
'订单金额', '订单金额',
'折扣金额', // '折扣金额',
'实付金额', '实付金额',
'支付方式', '支付方式',
'充值状态', '充值状态',
@ -4676,7 +4676,7 @@ public function iosDetailExcelInfo($id,$map) {
$csvData["user_account"] = $value1["user_account"]; $csvData["user_account"] = $value1["user_account"];
$csvData["pay_order_number"] = $value1["pay_order_number"]; $csvData["pay_order_number"] = $value1["pay_order_number"];
$csvData["cost"] = $value1["cost"]; $csvData["cost"] = $value1["cost"];
$csvData["discount_amount"] = $value1["discount_amount"]; // $csvData["discount_amount"] = $value1["discount_amount"];
$csvData["pay_amount"] = $value1["pay_amount"]; $csvData["pay_amount"] = $value1["pay_amount"];
$csvData["pay_way"] = $value1["pay_way"]; $csvData["pay_way"] = $value1["pay_way"];
$csvData['pay_status'] = $value1['pay_status']; $csvData['pay_status'] = $value1['pay_status'];
@ -4707,7 +4707,7 @@ public function iosDetailExcelInfo($id,$map) {
$csvData1["user_account"] = "合计"; $csvData1["user_account"] = "合计";
$csvData1["pay_order_number"] = "--"; $csvData1["pay_order_number"] = "--";
$csvData1["cost"] = $aggregation['cost']; $csvData1["cost"] = $aggregation['cost'];
$csvData1["discount_amount"] = $aggregation['discount_amount']; // $csvData1["discount_amount"] = $aggregation['discount_amount'];
$csvData1["pay_amount"] = $aggregation['pay_amount']; $csvData1["pay_amount"] = $aggregation['pay_amount'];
$csvData1["pay_way"] = "--"; $csvData1["pay_way"] = "--";
$csvData1['pay_status'] = "--"; $csvData1['pay_status'] = "--";

@ -195,7 +195,7 @@
<th>支付方式</th> <th>支付方式</th>
<th>充值状态</th> <th>充值状态</th>
<th>订单金额</th> <th>订单金额</th>
<th>折扣金额</th> <!-- <th>折扣金额</th> -->
<th>实付金额</th> <th>实付金额</th>
<th>游戏名称</th> <th>游戏名称</th>
<th>设备类型</th> <th>设备类型</th>
@ -223,7 +223,7 @@
<td>{:get_pay_way($vo['pay_way'])}</td> <td>{:get_pay_way($vo['pay_way'])}</td>
<td>{$vo.pay_status}</td> <td>{$vo.pay_status}</td>
<td>{$vo.cost}</td> <td>{$vo.cost}</td>
<td>{$vo.discount_amount}</td> <!-- <td>{$vo.discount_amount}</td> -->
<td>{$vo.pay_amount}</td> <td>{$vo.pay_amount}</td>
<td>{$vo.game_name}</td> <td>{$vo.game_name}</td>
<td>{$vo.sdk_version}</td> <td>{$vo.sdk_version}</td>
@ -246,7 +246,7 @@
<td>--</td> <td>--</td>
<td>--</td> <td>--</td>
<td>{$aggregation.cost}</td> <td>{$aggregation.cost}</td>
<td>{$aggregation.discount_amount}</td> <!-- <td>{$aggregation.discount_amount}</td> -->
<td>{$aggregation.pay_amount}</td> <td>{$aggregation.pay_amount}</td>
<td>--</td> <td>--</td>
<td>--</td> <td>--</td>

Loading…
Cancel
Save