diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 556fde811..470ae342a 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -132,11 +132,13 @@ class BehaviorLogController extends ThinkController $show_data = []; foreach($data as $k => $v) { if($v['tab'] == 'spend') { - $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('spend', 'tab_')->field('extend,pay_time,payed_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['pay_time']; + $re_data['payed_time'] = date("Y-m-d H:i:s", $order_detail['payed_time']); } elseif($v['tab'] == 'deposit') { - $order_detail = M('deposit', 'tab_')->field('create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('deposit', 'tab_')->field('create_time,user_account,payed_time,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['create_time']; + $re_data['payed_time'] = date("Y-m-d H:i:s", $order_detail['payed_time']); } $re_data['extend'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index b641c30cf..87956b9c9 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1173,7 +1173,7 @@ class ExportController extends Controller $xlsCell = array( - "支付订单号","CP订单号", "充值时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "充值ip","区服ID", "游戏区服", + "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "充值ip","区服ID", "游戏区服", "角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}" ); @@ -1205,7 +1205,7 @@ class ExportController extends Controller // ->join($tab_promote_join) // ->order('pay_time DESC') // ->select(); - ->field('pay_order_number,extend,pay_time,user_account,game_name,promote_account,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status') + ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status') ->where($map) ->limit(($i-1)*$perSize ,$perSize) ->order($order ? $order : 'pay_time desc') @@ -1213,6 +1213,11 @@ class ExportController extends Controller foreach($xlsData as $value) { $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']); + if($value['pay_status'] == 1) { + $value['payed_time'] = date('Y-m-d H:i:s',$value['payed_time']); + }else { + $value['payed_time'] = "------"; + } $value['extend'] = $value['extend'].'`'; $value['pay_way'] = get_pay_way($value['pay_way']); $value['pay_status'] = get_info_status($value['pay_status'],9); @@ -1325,6 +1330,7 @@ class ExportController extends Controller array('pay_way', "充值方式", 'get_pay_way', '*'), array('pay_ip', "充值ip"), array('create_time', "充值时间"), + array('payed_time','支付时间'), array('pay_status', L('Order_status'), 'get_info_status', '*', '9'), array('', "共计充值{$total}"), ); @@ -1334,6 +1340,11 @@ class ExportController extends Controller ->select(); foreach ($xlsData as $key => $value) { $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); + if ($value['pay_status'] == 1){ + $xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']); + }else { + $xlsData[$key]['payed_time'] = "-----"; + } } // dd($xlsData); break; @@ -2249,11 +2260,13 @@ class ExportController extends Controller $xlsData = []; foreach($data as $k => $v) { if($v['tab'] == 'spend') { - $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('spend', 'tab_')->field('extend,pay_time,payed_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = set_show_time($order_detail['pay_time']); + $re_data['payed_time'] = set_show_time($order_detail['payed_time']); } elseif($v['tab'] == 'deposit') { - $order_detail = M('deposit', 'tab_')->field('create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('deposit', 'tab_')->field('create_time,payed_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = set_show_time($order_detail['create_time']); + $re_data['payed_time'] = set_show_time($order_detail['payed_time']); } $re_data['extend'] = !empty($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; @@ -3692,6 +3705,7 @@ class ExportController extends Controller array('pay_way' , "充值方式"), array('recharge_ip' , "充值IP"), array('create_time' , "充值时间"), + array('payed_time' , "支付时间"), array('pay_status' , "订单状态"), ); $xlsName = $_REQUEST['xlsname']; @@ -3699,6 +3713,11 @@ class ExportController extends Controller foreach ($data as $key => $value) { $data[$key]['pay_way'] = get_pay_way($value['pay_way']); $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']); + if ($value['pay_status'] == 1) { + $data[$key]['payed_time'] = date('Y-m-d H:i:s',$value['payed_time']); + }else { + $data[$key]['payed_time'] = "-----"; + } $data[$key]['pay_status'] = get_info_status($value['pay_status'],9); } $xlsData = $data; diff --git a/Application/Admin/View/BehaviorLog/singleSupplement.html b/Application/Admin/View/BehaviorLog/singleSupplement.html index 72be628fd..525c0a5ae 100644 --- a/Application/Admin/View/BehaviorLog/singleSupplement.html +++ b/Application/Admin/View/BehaviorLog/singleSupplement.html @@ -94,6 +94,7 @@ 支付订单号 CP订单号 充值时间 + 支付时间 玩家账号 所属推广员 游戏名称 @@ -127,6 +128,7 @@ {:set_show_time($vo['pay_time'])} + {$vo['payed_time']} {$vo.user_account} diff --git a/Application/Admin/View/BindRechargeRecord/lists.html b/Application/Admin/View/BindRechargeRecord/lists.html index ca668d2bd..fe66dfd30 100644 --- a/Application/Admin/View/BindRechargeRecord/lists.html +++ b/Application/Admin/View/BindRechargeRecord/lists.html @@ -105,6 +105,7 @@ 充值方式 充值ip 充值时间 + 支付时间 订单状态 @@ -147,6 +148,13 @@ {:get_pay_way($vo['pay_way'])} {$vo.recharge_ip} {:set_show_time($vo['create_time'])} + + + {:set_show_time($vo['payed_time'],'','pay')} + + ----- + + {:get_info_status($vo['pay_status'],9)} diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 1d7a97cce..25a450bf2 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -130,6 +130,7 @@ 充值时间 + 支付时间 订单状态 操作 @@ -176,6 +177,13 @@ {:get_pay_way($data['pay_way'])}无 {$data.pay_ip} {:set_show_time($data['create_time'],'','pay')} + + + {:set_show_time($data['payed_time'],'','pay')} + + ------ + + {:get_info_status($data['pay_status'],9)} diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 8762b8de3..3f14a8f8c 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -147,6 +147,7 @@ 充值时间 + 支付时间 玩家账号 游戏名称 所属推广员 @@ -188,6 +189,13 @@ {:set_show_time($data['pay_time'])} + + + {$data.payed_time} + + ------ + + {$data.user_account}