diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 2b664b965..2d48c4a3c 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2409,35 +2409,35 @@ class ExportController extends Controller // } if(isset($params['server_type'])) { - $map['tab_test_order.server_type'] = $params['server_type']; + $map['t.server_type'] = $params['server_type']; } if(isset($params['order_type'])) { - $map['tab_test_order.order_type'] = $params['order_type']; + $map['t.order_type'] = $params['order_type']; } if(isset($params['order_no'])) { - $map['tab_test_order.order_no'] = $params['order_no']; + $map['t.order_no'] = $params['order_no']; } if(isset($params['user_account'])) { - $map['tab_test_order.user_account'] = $params['user_account']; + $map['t.user_account'] = $params['user_account']; } if(isset($params['pay_way'])) { - $map['tab_test_order.pay_way'] = $params['pay_way']; + $map['t.pay_way'] = $params['pay_way']; } if(!empty($params['timestart']) && !empty($params['timeend'])){ $timestart = strtotime($params['timestart']); $timeend = strtotime($params['timeend'])+86399; - $map['tab_test_order.pay_time'] = array("between",array($timestart,$timeend)); + $map['t.pay_time'] = array("between",array($timestart,$timeend)); }else if(!empty($params['timestart']) && empty($params['timeend'])) { $timestart = strtotime($params['timestart']); - $map['tab_test_order.pay_time'] = array("EGT",$timestart); + $map['t.pay_time'] = array("EGT",$timestart); }else if (!empty($params['timeend']) && empty($params['timestart'])) { $timeend = strtotime($params['timeend'])+86399; - $map['tab_test_order.pay_time'] = array("ELT",$timeend); + $map['t.pay_time'] = array("ELT",$timeend); } @@ -2445,8 +2445,8 @@ class ExportController extends Controller ->field("t.*,g.sdk_version") ->join("tab_game g on t.game_id = g.id","left") ->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(); + $sum_order_amount = M('test_order', 'tab_')->alias("t")->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); + $sum_pay_amount = M('test_order', 'tab_')->alias("t")->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); $xlsData = []; foreach($orderData as $k => $v) { if ($v['server_type'] == 1) { diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 48c8ed9ce..6f8c9ad1f 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -402,6 +402,7 @@ class PayChannelController extends ThinkController $this->assign('channelData2',$channelData); $this->assign('sum_platform_pay_amount',$sum_platform_pay_amount); $this->assign('sum_noplatform_pay_amount',$sum_noplatform_pay_amount); + $this->assign('sum_pay_amount',$sum_pay_amount); $moneyAllCount = array_sum(array_column($channelData, 'pay_amount')); $this->assign('moneyAllCount',$moneyAllCount); $this->display(); diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 0a626a9e9..a11d8b3d3 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -232,7 +232,7 @@ 0.00 {$sum_pay_amount['sum_order_amount']}0.00 - 订单查看 + 订单查看 diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index 2595921aa..a0f51960f 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -155,11 +155,11 @@ 测试内网测试外网 {$data.order_type|get_order_type} {$data.order_no} - {$data.cp_order_no} + {$data.cp_order_no} {$data.user_account} {$data.pay_time|date='Y-m-d H:i:s',###} - {$data.game_name} - {$data.sdk_version} + {$data.game_name} + {$data.sdk_version} {$data.order_amount} {$data.pay_amount} {$data.pay_way|get_pay_way}