diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 6d3c88f7f..63e4428a5 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -871,18 +871,27 @@ class QueryController extends ThinkController $this->display(); } - public function withdrawDetails($settlement_number = '') + public function withdrawDetails($id) { - $map['settlement_number'] = $settlement_number; - $data = M('TotalSettlement', 'tab_')->where($map)->find(); - $settMap['promote_id'] = $data['promote_id']; - $settMap['starttime'] = $data['starttime']; - $settMap['endtime'] = $data['endtime']; - $settMap['create_time'] = $data['create_time']; - $dataSett = M('settlement', 'tab_')->where($settMap)->select(); - $total = M('settlement', 'tab_')->where($settMap)->sum('sum_money'); - $this->assign('list_data', $dataSett); - $this->assign('total', $total); + $id = intval($id); + $map['withdraw_id'] = $id; + $data = M('Spend', 'tab_') + ->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,pay_time,selle_status,pay_status,withdraw_id') + ->where($map)->select(); + + //提现状态 + $withdrawStatus = M('withdraw', 'tab_') + ->where(array('id' => $id)) + ->getField('status'); + $withdrawStatus = \Home\Controller\FinanceController::$withdrawStatus[$withdrawStatus]; + + foreach ($data as &$list) { + $list['income'] = bcmul($list['pay_amount'], bcdiv($list['selle_ratio'], 100, 2), 2); + $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']); + } + + $this->assign('listData', $data); + $this->assign('withdrawStatus', $withdrawStatus); $this->display(); } diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index d9f71f886..f2e443be4 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -145,7 +145,7 @@ 通过 驳回 - + 上传汇款证明 diff --git a/Application/Admin/View/Query/withdrawDetails.html b/Application/Admin/View/Query/withdrawDetails.html index 2e9e48cc7..b6067b5de 100644 --- a/Application/Admin/View/Query/withdrawDetails.html +++ b/Application/Admin/View/Query/withdrawDetails.html @@ -2,7 +2,7 @@ - 结算详情 + 订单详情 @@ -28,35 +28,42 @@ body{ padding: 0px; } - 结算周期 - 游戏名称 - 总充值 - 总注册 - 结算模式 - 分成比例 - 注册单价 - 结算金额 + 游戏订单号 + 游戏 + 玩家账号 + 推广员账号 + 订单总额 + 直充 + 内充 + 分成比例(直充|内充) + 收益 + 充值时间 + 订单状态 - + - {$data.starttime|date='Y-m-d',###}至{$data.endtime|date='Y-m-d',###} - {$data.game_name} - {$data.total_money} - {$data.total_number} - {:get_pattern($data['pattern'])} - {$data.ratio} - {$data.money} - {$data.sum_money} + {$vo.pay_order_number} + {$vo.game_name} + {$vo.user_account} + {$vo.promote_account} + {$vo.pay_amount} + + 0 + {$vo.pay_amount} + + {$vo.pay_amount} + 0 + + {$vo.selle_ratio}%|{$vo.selle_ratio}% + {$vo.income} + {$vo.pay_time} + {$withdrawStatus} - - 汇总：{$total} - -