diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index 7689e6548..72160c12f 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -55,7 +55,7 @@ class FinanceController extends BaseController $map['pay_time'] = ['between', [$begTime, $endTime + 86399]]; } - $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,selle_ratio,convert(pay_amount*selle_ratio,decimal(10,2)) as income,pay_time,pay_status') + $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,selle_ratio,convert(pay_amount*selle_ratio,decimal(10,2)) as income,pay_time,selle_status') ->where($map) ->order('id desc') ->page($page, $row) @@ -63,7 +63,14 @@ class FinanceController extends BaseController $count = $model->where($map)->count(); foreach ($data as &$list) { - $list['pay_status'] = ($list['pay_status'] == 0) ? '失败' : '成功'; + switch ($list['selle_status']) { + case 0: + $list['selle_status'] = '未提现'; + break; + default: + $list['selle_status'] = ''; + break; + } $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']); } diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index 945ef77df..2afb8d117 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -136,7 +136,7 @@