diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index b14d030a7..d817c5e55 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -208,7 +208,7 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,company_belong"; + IFNULL(company_id,0) company_id,company_name,promote.company_belong"; return M() ->table("tab_spend s") ->field($field) @@ -225,7 +225,7 @@ class FinancePromoteController extends AdminController $map['s.source_id']=0; $field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount,IFNULL(if(substring_index(substring_index(`chain`,'/',2),'/',-1)='', s.promote_id,substring_index(substring_index(`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,company_belong"; + IFNULL(company_id,0) company_id,company_name,promote.company_belong"; return M("promote_coin s","tab_") ->field($field) ->where($map) @@ -362,7 +362,7 @@ class FinancePromoteController extends AdminController $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, - IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,company_belong"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,promote.company_belong"; return M() ->table("tab_spend s") ->field($field) @@ -378,7 +378,7 @@ class FinancePromoteController extends AdminController $map['s.status']=1; $map['s.source_id']=0; $field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount, - IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,company_belong"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,promote.company_belong"; return M("promote_coin s","tab_") ->field($field) ->where($map) diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 07fadb420..c1040fa63 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -792,4 +792,27 @@ class StatementMangementController extends ThinkController } + public function personOrderDetail() { + + $id = $_REQUEST['id']; + + $map['id'] = $id; + + $data = M('statement','tab_') + ->field("second_party_info,statement_info") + ->where($map) + ->find(); + + + $data['second_party_info'] = json_decode($data['second_party_info'],true); + $data['statemnt_info'] = json_decode($data['statement_info'],true); + +// dump($data['statemnt_info']);die(); + + $this->assign('second_party_info',$data['second_party_info']); + $this->assign('statemnt_info',$data['statemnt_info']); + + $this->display(); + } + } diff --git a/Application/Admin/View/StatementMangement/PersonOrderEdit.html b/Application/Admin/View/StatementMangement/PersonOrderEdit.html index e056edab5..ebac1aa4d 100644 --- a/Application/Admin/View/StatementMangement/PersonOrderEdit.html +++ b/Application/Admin/View/StatementMangement/PersonOrderEdit.html @@ -306,6 +306,10 @@ } } + $("#back").click(function () { + window.parent.reload(); + }); + $("#confirm").click(function() { var withdraw_datas = []; $('.withdraw_datas tr').each(function() { diff --git a/Application/Admin/View/StatementMangement/PersonOrderList.html b/Application/Admin/View/StatementMangement/PersonOrderList.html index 255b38669..952268e45 100644 --- a/Application/Admin/View/StatementMangement/PersonOrderList.html +++ b/Application/Admin/View/StatementMangement/PersonOrderList.html @@ -305,6 +305,10 @@ } } + $("#back").click(function () { + window.parent.reload(); + }); + $("#confirm").click(function() { var withdraw_datas = []; $('.withdraw_datas tr').each(function() { diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index 402fd98f8..953b1ca09 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -132,7 +132,7 @@ {$data.statement_money} 未确认确认 - 查看 + 查看 编辑 @@ -259,7 +259,14 @@ }); $(".statement_view").click(function () { var id = $(this).data("id"); - var url = "/admin.php?s=/VerifyBill/show/id/"+id+"/from/pc"; + + var type = $(this).data("type"); + if (type == 2) { + var url = "/admin.php?s=/StatementMangement/personOrderDetail/id/"+id; + } else { + var url = "/admin.php?s=/VerifyBill/show/id/"+id+"/from/pc"; + } + layer.open({ type: 2, title: "海南万盟天下科技有限公司", diff --git a/Application/Admin/View/StatementMangement/personOrderDetail.html b/Application/Admin/View/StatementMangement/personOrderDetail.html new file mode 100644 index 000000000..ff25f3c40 --- /dev/null +++ b/Application/Admin/View/StatementMangement/personOrderDetail.html @@ -0,0 +1,394 @@ + + + + + + + 充值查询列表|----软件管理平台 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
提现订单号结算时间订单类型会长
aOh! 暂时还没有内容!
{$withdraw_data.widthdraw_number}{$withdraw_data.time}{$withdraw_data.settlement_type}{$withdraw_data.promote_account}
+
+ +
+ + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号下游名称会长账号市场员下游类型产品结算时间推广流水分成比例奖励罚款结算金额开户名银行卡号开户支行
{$data.id}{$data.company_name}{$data.promote_account}{$data.username}{$data.type}{$data.game_name}{$data.time|0}{$data.sum_amount|0}{$data.selle_ratio|0}{$data.reward|0}{$data.forfeit|0}{$data.real_amount|0}{$data.bank_account}{$data.bank_card}{$data.account_openin}
+
+ +
+ + + + +
+ + 导出 + + {$_page|default=''} +
+ + + + + + if(C('COLOR_STYLE')=='blue_color') echo ' + + '; + + + + + + + + +