From 71b1498c71246b8263f9459f8a458d9b6ba6902a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 9 Jan 2020 18:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AjaxController.class.php | 63 +++++++++++- .../StatementMangementController.class.php | 98 +++++++++++++++++-- .../createDownstreamOrder.html | 61 ++++++++++-- .../Admin/View/StatementMangement/lists.html | 8 +- 4 files changed, 204 insertions(+), 26 deletions(-) diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index fe5aca488..0afe5923d 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -259,16 +259,71 @@ class AjaxController extends ThinkController{ $data['settlement_type'] = '补点订单'; } $data['game_ratio'] = json_decode($data['game_ratio'],true); - if (is_array($data['game_ratio'])) { - foreach ($data['game_ratio'] as $key=>&$value) { - foreach($value as $k => &$v) { - $v['game_name'] = get_gamename($key); + $getStatementData =M('statement','tab_')->where(['ext_field'=>$withdraw_number])->find(); + + $statementData = json_decode($getStatementData['statement_info'],true); + + if ($statementData) { + $data['sum'] = $getStatementData['statement_money']; + $data['pay_amount'] = $getStatementData['pay_amount']; + $handleStatementData = []; + foreach ($statementData as $key=>$sv) { + if ($sv['game_id']) { + + $nowVal['selle_ratio'] = $sv['second_ratio']; + $nowVal['sum_amount'] = $sv['pay_amount']; + $nowVal['begin_time'] = $sv['statement_begin_time']; + $nowVal['end_time'] = $sv['statement_end_time']; + $nowVal['game_name'] = $sv['game_name']; + $nowVal['fax_ratio'] = $sv['fax_ratio']; + $nowVal['sum'] = $sv['sum_money']; + + $handleStatementData[$sv['game_id']][] = $nowVal; + } else { + $data['forfeit'] = $sv['sum_money']; } + } + $first_party_info = json_decode($getStatementData['first_party_info'],true); + $second_party_info = json_decode($getStatementData['second_party_info'],true); + $data['game_ratio'] = $handleStatementData; + $data['company_name'] = $second_party_info['partner']; + $data['mobile_phone'] = $second_party_info['link_phone']; + $data['settlement_type'] = $second_party_info['settlement_type']; + $data['address'] = $second_party_info['address']; + $data['real_name'] = $second_party_info['link_man']; + $data['settlement_type_value'] = $getStatementData['settlement_type']; + + $data['invoice_item'] = $second_party_info['invoice_item']; + $data['invoice_type'] = $second_party_info['invoice_type']; + + $data['jfCompany'] = $first_party_info['jfCompany']; + $data['jfPerson'] = $first_party_info['jfPerson']; + $data['jfTel'] = $first_party_info['jfTel']; + if ($getStatementData['settlement_type']=='周结订单') { + $data['settlement_type_value'] = 1; + } else if ($getStatementData['settlement_type']=='月结订单') { + $data['settlement_type_value'] = 2; + } else { + $data['settlement_type_value'] = 3; + } + +// dump($statementData);die(); + } else { + if (is_array($data['game_ratio'])) { + foreach ($data['game_ratio'] as $key => &$value) { + + foreach ($value as $k => &$v) { + $v['game_name'] = get_gamename($key); + } + + } } } +// dump($data);die(); + $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>$data]); } diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 5748e6205..a761e0e87 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -32,6 +32,7 @@ class StatementMangementController extends ThinkController $data = M("statement","tab_") ->where($map) + ->order("create_time Desc") ->select(); foreach($data as $key => $value) { @@ -41,7 +42,7 @@ class StatementMangementController extends ThinkController $data[$key]['statement_end_time'] = date('Y-m-d H:i:s',$value['statement_end_time']); $data[$key]['is_confirm'] = $data[$key]['is_confirm']?'确认':'未确认'; - $data[$key]['statement_type'] = $value['statement_type']?'公会对账单':'CP对账单'; +// $data[$key]['statement_type'] = $value['statement_type']?'公会对账单':'CP对账单'; } @@ -59,33 +60,110 @@ class StatementMangementController extends ThinkController public function saveDownstreamOrder() { + + $second_party_info = $_REQUEST['second_party_info']; $first_party_info = $_REQUEST['first_party_info']; $statement_info = $_REQUEST['statement_info']; $sumData = $_REQUEST['sum_data']; + if (!$second_party_info||!$first_party_info||!$statement_info||!$statement_info) { + $this->ajaxReturn(['code'=>0, 'msg'=>'数据错误' ]); + } $insert['statement_type'] = 1; $insert['company_id'] = $_REQUEST['company_id']; $insert['company_name'] = $second_party_info['partner']; $insert['link_phone'] = $second_party_info['link_phone'];; - $insert['statement_begin_time'] = 0; - $insert['statement_end_time'] = 0; + + $statement_begin_time = strtotime($statement_info[0]['statement_begin_time']); + $statement_end_time = strtotime($statement_info[0]['statement_end_time']); + + foreach($statement_info as $key => $value) { + + if ($statement_begin_time>strtotime($value['statement_begin_time'])&&$value['statement_begin_time']) { + $statement_begin_time = strtotime($value['statement_begin_time']); + } +// var_dump(strtotime($value['statement_begin_time']); + + if ($statement_end_timewhere(['ext_field'=>$_REQUEST['ext_field']])->find())) { + M('statement','tab_')->add($insert); + $this->ajaxReturn(['code'=>1, 'msg'=>'生成结算单成功']); + } else { + $this->ajaxReturn(['code'=>0, 'msg'=>'生成结算单失败,结算单已经存在']); + } + + } + + public function editDownstreamOrder() { + + $this->display('edit'); + + } + public function editDownstreamOrderSave() { + $second_party_info = $_REQUEST['second_party_info']; + $first_party_info = $_REQUEST['first_party_info']; + $statement_info = $_REQUEST['statement_info']; + $sumData = $_REQUEST['sum_data']; + + if (!$second_party_info||!$first_party_info||!$statement_info||!$statement_info) { + $this->ajaxReturn(['code'=>0, 'msg'=>'数据错误' ]); + } + $insert['statement_type'] = 1; + $insert['company_id'] = $_REQUEST['company_id']; + $insert['company_name'] = $second_party_info['partner']; + $insert['link_phone'] = $second_party_info['link_phone'];; + + $statement_begin_time = strtotime($statement_info[0]['statement_begin_time']); + $statement_end_time = strtotime($statement_info[0]['statement_end_time']); + foreach($statement_info as $key => $value) { + if ($statement_begin_time>strtotime($value['statement_begin_time'])&&$value['statement_begin_time']) { + $statement_begin_time = strtotime($value['statement_begin_time']); + } +// var_dump(strtotime($value['statement_begin_time']); - dump(json_encode($second_party_info)); - dump(json_encode($first_party_info)); - dump(json_encode($statement_info)); + if ($statement_end_timewhere(['ext_field'=>$_REQUEST['ext_field']])->save($insert))) { + $this->ajaxReturn(['code'=>1, 'msg'=>'结算单编辑成功']); + } else { + $this->ajaxReturn(['code'=>0, 'msg'=>'结算单编辑失败']); + } } + } diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html index 37b317b05..b439dc884 100644 --- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html +++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html @@ -81,7 +81,7 @@
联 系 人：    - +
开票项目： @@ -239,7 +239,7 @@ ""+game_ratio[p][i].game_name+"" + ""+game_ratio[p][i].sum_amount+"" + ""+game_ratio[p][i].selle_ratio+"%" + - "%" + + "%" + ""+(game_ratio[p][i].sum_amount*(game_ratio[p][i].selle_ratio/100)).toFixed(2)+""; sum = sum +parseFloat((game_ratio[p][i].sum_amount*(game_ratio[p][i].selle_ratio/100)).toFixed(2)); key++; @@ -276,10 +276,11 @@ function eventnew(){ $(".tax").off("blur"); $(".tax").on("blur", function() { - + var lastNum = $(this).parent().next().text(); $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2)); - - $(".sumAll").text((($(".sumAll").attr('data-value')-$(this).parent().next().attr('data-value')+$(this).parent().next().attr('data-value')*(1-$(this).val()/100))-($(".forfeit").val())).toFixed(2)); + var nowNum = $(this).parent().next().text(); + console.log((nowNum-lastNum)) + $(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2)); }); $(".forfeit").off("blur"); @@ -313,10 +314,9 @@ var sumData = {}; var company_id = $("#company_name option:selected").attr('company_id'); - ext_field=$("ext_field").val(); + ext_field=$("#ext_field").val(); console.log(ext_field) - second_party_info['partner'] = $("#company_name").val(); second_party_info["bank_account"] = $("#bank_card").val(); second_party_info["opening_bank"] = $("#account_openin").val(); @@ -367,7 +367,47 @@ sumData['statement_money'] = $(".sumAll").text(); sumData['pay_amount'] = $(".sumAmount").text(); - console.log(sumData) + if (!ext_field) { + layer.msg("提现单号不能为空"); + return; + } + + if (!second_party_info['partner']) { + layer.msg("乙方不能为空"); + return; + } + + if (!second_party_info['link_man']) { + layer.msg("联系人不能为空"); + return; + } + var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(17[0]{1})|(15[0-3]{1})|(15[5-9]{1})|(18[0-9]{1}))+\d{8})$/; + if (!myreg.test(second_party_info['link_phone'])) { + layer.msg("乙方联系电话必须有效"); + return; + } + if (!second_party_info["bank_account"]) { + layer.msg("银行账号不能为空"); + return; + } + if (!second_party_info["opening_bank"]) { + layer.msg("开户行不能为空"); + return; + } + if(!second_party_info['address']) { + layer.msg("邮寄地址不能为空"); + return; + } + + if(!first_party_info['jfPerson']) { + layer.msg("甲方联系人不能为空"); + return; + } + + if(!myreg.test(first_party_info['jfTel'])) { + layer.msg("甲方联系电话必须有效"); + return; + } $.ajax({ url: "{:U('StatementMangement/saveDownstreamOrder')}", @@ -376,7 +416,10 @@ "statement_info":pushStatement,"sum_data":sumData,"ext_field":ext_field,"company_id":company_id}, dataType: 'json', success: function (data) { - + layer.msg(data.msg); + setTimeout(function(){ + window.parent.reload(); + },1500); } }); diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index 6bea277d6..1d3abf4de 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -123,14 +123,14 @@ - {$data.statement_type} + 周结订单月结订单补点订单 {$data.create_time} {$data.company_name} {$data.statement_begin_time}-{$data.statement_end_time} {$data.statement_money} {$data.is_confirm} 撤销 - 编辑 + 编辑 @@ -218,10 +218,12 @@ $(".statement_edit").click(function () { var edit = $(this).data(); + var ext_field = $(this).attr('ext_field'); + console.log(ext_field) if(edit.type == 0){ var url = "/admin.php?s=/Statement/editCpStatement/id/"+edit.id; }else{ - var url = "/admin.php?s=/StatementMangement/editDownstreamOrder/id/"+edit.id; + var url = "/admin.php?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field; } layer.open({