elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付时间

Browse Source
master
sunke 5 years ago
parent b178b4cbe5
commit 7da471b6ee
6 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
Application/Admin/Controller/BehaviorLogController.class.php
Unescape Escape View File

@ -132,11 +132,13 @@ class BehaviorLogController extends ThinkController
$show_data = []; $show_data = [];
foreach($data as $k => $v) { foreach($data as $k => $v) {
if($v['tab'] == 'spend') { 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['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') { } 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['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['extend'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-';
$re_data['user_account'] = $order_detail['user_account']; $re_data['user_account'] = $order_detail['user_account'];

27
Application/Admin/Controller/ExportController.class.php
Unescape Escape View File

@ -1173,7 +1173,7 @@ class ExportController extends Controller
$xlsCell = array( $xlsCell = array(
"支付订单号","CP订单号", "充值时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "充值ip","区服ID", "游戏区服", "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "充值ip","区服ID", "游戏区服",
"角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}" "角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}"
); );
@ -1205,7 +1205,7 @@ class ExportController extends Controller
// ->join($tab_promote_join) // ->join($tab_promote_join)
// ->order('pay_time DESC') // ->order('pay_time DESC')
// ->select(); // ->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) ->where($map)
->limit(($i-1)*$perSize ,$perSize) ->limit(($i-1)*$perSize ,$perSize)
->order($order ? $order : 'pay_time desc') ->order($order ? $order : 'pay_time desc')
@ -1213,6 +1213,11 @@ class ExportController extends Controller
foreach($xlsData as $value) { foreach($xlsData as $value) {
$value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']); $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['extend'] = $value['extend'].'`';
$value['pay_way'] = get_pay_way($value['pay_way']); $value['pay_way'] = get_pay_way($value['pay_way']);
$value['pay_status'] = get_info_status($value['pay_status'],9); $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_way', "充值方式", 'get_pay_way', '*'),
array('pay_ip', "充值ip"), array('pay_ip', "充值ip"),
array('create_time', "充值时间"), array('create_time', "充值时间"),
array('payed_time','支付时间'),
array('pay_status', L('Order_status'), 'get_info_status', '*', '9'), array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
array('', "共计充值{$total}"), array('', "共计充值{$total}"),
); );
@ -1334,6 +1340,11 @@ class ExportController extends Controller
->select(); ->select();
foreach ($xlsData as $key => $value) { foreach ($xlsData as $key => $value) {
$xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); $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); // dd($xlsData);
break; break;
@ -2249,11 +2260,13 @@ class ExportController extends Controller
$xlsData = []; $xlsData = [];
foreach($data as $k => $v) { foreach($data as $k => $v) {
if($v['tab'] == 'spend') { 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['pay_time'] = set_show_time($order_detail['pay_time']);
$re_data['payed_time'] = set_show_time($order_detail['payed_time']);
} elseif($v['tab'] == 'deposit') { } 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['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['extend'] = !empty($order_detail['extend']) ? $order_detail['extend'] : '-';
$re_data['user_account'] = $order_detail['user_account']; $re_data['user_account'] = $order_detail['user_account'];
@ -3692,6 +3705,7 @@ class ExportController extends Controller
array('pay_way' , "充值方式"), array('pay_way' , "充值方式"),
array('recharge_ip' , "充值IP"), array('recharge_ip' , "充值IP"),
array('create_time' , "充值时间"), array('create_time' , "充值时间"),
array('payed_time' , "支付时间"),
array('pay_status' , "订单状态"), array('pay_status' , "订单状态"),
); );
$xlsName = $_REQUEST['xlsname']; $xlsName = $_REQUEST['xlsname'];
@ -3699,6 +3713,11 @@ class ExportController extends Controller
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$data[$key]['pay_way'] = get_pay_way($value['pay_way']); $data[$key]['pay_way'] = get_pay_way($value['pay_way']);
$data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']); $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); $data[$key]['pay_status'] = get_info_status($value['pay_status'],9);
} }
$xlsData = $data; $xlsData = $data;

2
Application/Admin/View/BehaviorLog/singleSupplement.html
Unescape Escape View File

@ -94,6 +94,7 @@
<th>支付订单号</th> <th>支付订单号</th>
<th>CP订单号</th> <th>CP订单号</th>
<th>充值时间</th> <th>充值时间</th>
<th>支付时间</th>
<th>玩家账号</th> <th>玩家账号</th>
<th>所属推广员</th> <th>所属推广员</th>
<th>游戏名称</th> <th>游戏名称</th>
@ -127,6 +128,7 @@
</if> </if>
</td> </td>
<td>{:set_show_time($vo['pay_time'])}</td> <td>{:set_show_time($vo['pay_time'])}</td>
<td>{$vo['payed_time']}</td>
<td> <td>
<if condition="$show_data_power eq true "> <if condition="$show_data_power eq true ">
{$vo.user_account} {$vo.user_account}

8
Application/Admin/View/BindRechargeRecord/lists.html
Unescape Escape View File

@ -105,6 +105,7 @@
<th>充值方式</th> <th>充值方式</th>
<th>充值ip</th> <th>充值ip</th>
<th>充值时间</th> <th>充值时间</th>
<th>支付时间</th>
<th>订单状态</th> <th>订单状态</th>
</tr> </tr>
</thead> </thead>
@ -147,6 +148,13 @@
<td>{:get_pay_way($vo['pay_way'])}</td> <td>{:get_pay_way($vo['pay_way'])}</td>
<td>{$vo.recharge_ip}</td> <td>{$vo.recharge_ip}</td>
<td>{:set_show_time($vo['create_time'])}</td> <td>{:set_show_time($vo['create_time'])}</td>
<td>
<if condition="$vo['pay_status'] eq 1">
{:set_show_time($vo['payed_time'],'','pay')}
<else/>
-----
</if>
</td>
<td> <td>
<if condition="$vo['pay_status'] eq 1"> <if condition="$vo['pay_status'] eq 1">
<span class="order_status_color">{:get_info_status($vo['pay_status'],9)}</span> <span class="order_status_color">{:get_info_status($vo['pay_status'],9)}</span>

8
Application/Admin/View/Deposit/lists.html
Unescape Escape View File

@ -130,6 +130,7 @@
充值时间 充值时间
</a> </a>
</th> </th>
<th>支付时间</th>
<th>订单状态</th> <th>订单状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
@ -176,6 +177,13 @@
<td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td> <td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
<td>{$data.pay_ip}</td> <td>{$data.pay_ip}</td>
<td>{:set_show_time($data['create_time'],'','pay')}</td> <td>{:set_show_time($data['create_time'],'','pay')}</td>
<td>
<if condition="$data['pay_status'] eq 1">
{:set_show_time($data['payed_time'],'','pay')}
<else/>
------
</if>
</td>
<td> <td>
<if condition="$data['pay_status'] eq 1"> <if condition="$data['pay_status'] eq 1">
<span class="order_status_color">{:get_info_status($data['pay_status'],9)}</span> <span class="order_status_color">{:get_info_status($data['pay_status'],9)}</span>

8
Application/Admin/View/Spend/lists.html
Unescape Escape View File

@ -147,6 +147,7 @@
充值时间 充值时间
</a></th> </a></th>
<th>支付时间</th>
<th>玩家账号</th> <th>玩家账号</th>
<th>游戏名称</th> <th>游戏名称</th>
<th>所属推广员</th> <th>所属推广员</th>
@ -188,6 +189,13 @@
</if> </if>
</td> </td>
<td>{:set_show_time($data['pay_time'])}</td> <td>{:set_show_time($data['pay_time'])}</td>
<td>
<if condition="$data['pay_status'] eq 1">
{$data.payed_time}
<else />
------
</if>
</td>
<td> <td>
<if condition="$show_data_power eq true "> <if condition="$show_data_power eq true ">
{$data.user_account} {$data.user_account}

Write Preview
Loading…
Cancel
Save