diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1c2f1ef38..a95daf8ec 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -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["pay_order_number"] = $value1["pay_order_number"]; $csvData["cost"] = $value1["cost"]; - $csvData["discount_amount"] = $value1["discount_amount"]; + // $csvData["discount_amount"] = $value1["discount_amount"]; $csvData["pay_amount"] = $value1["pay_amount"]; $csvData["pay_way"] = $value1["pay_way"]; $csvData['pay_status'] = $value1['pay_status']; @@ -4707,7 +4707,7 @@ public function iosDetailExcelInfo($id,$map) { $csvData1["user_account"] = "合计"; $csvData1["pay_order_number"] = "--"; $csvData1["cost"] = $aggregation['cost']; - $csvData1["discount_amount"] = $aggregation['discount_amount']; + // $csvData1["discount_amount"] = $aggregation['discount_amount']; $csvData1["pay_amount"] = $aggregation['pay_amount']; $csvData1["pay_way"] = "--"; $csvData1['pay_status'] = "--"; diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index e2d8917ff..09261f01d 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -195,7 +195,7 @@ 支付方式 充值状态 订单金额 - 折扣金额 + 实付金额 游戏名称 设备类型 @@ -223,7 +223,7 @@ {:get_pay_way($vo['pay_way'])} {$vo.pay_status} {$vo.cost} - {$vo.discount_amount} + {$vo.pay_amount} {$vo.game_name} {$vo.sdk_version} @@ -246,7 +246,7 @@ -- -- {$aggregation.cost} - {$aggregation.discount_amount} + {$aggregation.pay_amount} -- --