From cd427a940972d126fbd741e0c30d5b997e72f2c9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 9 Jan 2020 14:29:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0cp?= =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=AF=B9=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/StatementController.class.php | 211 +++++ .../View/Statement/createCpStatement.html | 793 ++++++++++++++++++ Data/update.sql | 24 +- 3 files changed, 1027 insertions(+), 1 deletion(-) create mode 100644 Application/Admin/Controller/StatementController.class.php create mode 100644 Application/Admin/View/Statement/createCpStatement.html diff --git a/Application/Admin/Controller/StatementController.class.php b/Application/Admin/Controller/StatementController.class.php new file mode 100644 index 000000000..4219e588f --- /dev/null +++ b/Application/Admin/Controller/StatementController.class.php @@ -0,0 +1,211 @@ + 0, + "partner" => "海南万盟天下科技有限公司", + "link_man" => "雷丽华", + "link_phone" => "13067391751", + "address" => "福建省福州市鼓楼区福大怡山创业园区11号103", + "company_tax_no" => "1243245", + "payee_name" => "雷丽华", + "bank_account" => "1654654564364635456", + "opening_bank" => "福州市福大分行" + ); + //创建 + public function createCpStatement() + { + $this->display(); + //获取cp推广公司 + + } + //获取推广公司基础信息 + public function getCpCompanyInfo() + { + $CompanyId = $_REQUEST['company_id']; + if($CompanyId == 0){ + $info = $this->mycompany; + }else{ + $info = M("partner","tab_")->where("id = '{$CompanyId}'")->find(); + } + + if(empty($info)){ + $this->ajaxReturn(array("error"=>"no find","code"=>2000)); + }else{ + $this->ajaxReturn(array("success"=>$info,"code"=>0)); + } + + } + //按时间-公司id-获取订单及分成比例 + public function getSpendStatement() + { + $map["pay_status"] = 1; + + $CompanyId = $_REQUEST['company_id']; //对账公司id + $statement_type = $_REQUEST['statement_type']; + + $is_month = false;//是否是月结判断 + if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { + //判断是否是月结 + $tm = explode('-',$_REQUEST['time_start']); + $en = mktime(0,0,0,$tm[1]-0+1,1,$tm[0])-1; //当月最后一天时间戳 + $en2 = strtotime($_REQUEST['time_end']) + 86399; //上传的订单时间 + if($tm[2] == 1 && $en == $en2){ + $is_month = true; + } + $map['pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]]; + } + + //获取对应cp公司的游戏 + $game_list = M("game","tab_")->field("id")->where("partner_id = '{$CompanyId}'")->select(); + if($game_list){ + $map['game_id'] = ['in', implode(',', array_column($game_list,'id'))]; + } + //获取统计 + $list = M("Spend","tab_")->field('sum(pay_amount) pay_amount,game_id,game_name')->where($map)->group('game_id')->select(); + $CpGameRatio = M("CpGameRatio","tab_"); + $countarr = array( + "pay_amount"=>0, + "sum_money"=>0 + ); + foreach($list as $k=>&$v){ + $map = array( + "game_id"=>$v['game_id'], + "begin_total_amount"=>0, + ); + if($is_month){ + $map['begin_total_amount'] = array("ELT",$v['pay_amount']); + }; + $ratiores = $CpGameRatio->where($map)->order("begin_total_amount desc")->limit(1)->select(); + if(empty($ratiores)){ + $redio = 0; + }else{ + $redio = $ratiores[0]['ratio']; + } + $v['second_ratio'] = $redio; + $v['first_ratio'] = (100-$redio); + if($statement_type == 0){ + $v['sum_money'] = round($v['pay_amount']*$v['first_ratio']/100,2); + }else{ + $v['sum_money'] = round($v['pay_amount']*$v['second_ratio']/100,2); + } + + $countarr['pay_amount'] += $v['pay_amount']; + $countarr['sum_money'] += $v['sum_money']; + $v['fax_ratio'] = 0; + $v['promote_ratio'] = 0; + $v['statement_begin_time']=$_REQUEST['time_start']; + $v['statement_end_time']=$_REQUEST['time_end']; + $v['statement_type']=0; + } + $countarr['pay_amount'] = round($countarr['pay_amount'],2); + $countarr['sum_money'] = round($countarr['sum_money'],2); + + $this->ajaxReturn(array("success"=>$list,"count"=>$countarr,"code"=>0)); + + } + //添加数据 + public function doAddCpStatement(){ + $second_party_info = $_REQUEST['second_party_info']; + $statement_info = $_REQUEST['statement_info']; + $statement_info[] = array( + "sum_money"=>$_REQUEST['fine'], + "type_name"=>"罚款", + "statement_type"=>1 + ); + //拼凑数据 + $adddata = array( + "statement_type"=>0, + "company_id"=>$second_party_info['id'], + "company_name"=>$second_party_info['partner'], + "link_phone"=>$second_party_info['link_phone'], + "statement_begin_time"=>strtotime($_REQUEST['statement_begin_time']), + "statement_end_time"=>strtotime($_REQUEST['statement_end_time']), + 'create_time'=>time(), + "statement_money"=>$_REQUEST['statement_count']['sum_money'], + "pay_amount"=>$_REQUEST['statement_count']['pay_amount'], + "is_confirm"=>0, + "pay_type"=>$_REQUEST['statement_type'] == 0 ? 1 :0, + "first_party_info"=>json_encode($_REQUEST['first_party_info'],JSON_UNESCAPED_UNICODE), + "second_party_info"=>json_encode($_REQUEST['second_party_info'],JSON_UNESCAPED_UNICODE), + "statement_info"=>json_encode($statement_info,JSON_UNESCAPED_UNICODE) + ); + $res = M("statement","tab_")->add($adddata); + if($res){ + $this->ajaxReturn(array("success"=>"ok","code"=>0)); + }else{ + $this->ajaxReturn(array("error"=>"database error","code"=>2000)); + } + + + } + //测试数据 + public function testData() + { + $mycompany = array( + "id" => 0, + "partner" => "甲方海南万盟天下科技有限公司", + "link_man" => "雷丽华", + "link_phone" => "13067391751", + "address" => "福建省福州市鼓楼区福大怡山创业园区11号103", + "company_tax_no" => "1243245", + "payee_name" => "雷丽华", + "bank_account" => "1423134654531321564561636", + "opening_bank" => "福州市福大分行" + ); + $cpcompany = array( + "id" => 1, + "partner" => "乙方海南万盟天下科技有限公司", + "link_man" => "乙方雷丽华", + "link_phone" => "13067391752", + "address" => "福建省福州市鼓楼区福大怡山创业园区11号103", + "company_tax_no" => "1243245445646", + "payee_name" => "乙方王大锤", + "bank_account" => "2343254353462332423", + "opening_bank" => "福州市鼓楼区分行" + ); + $statement =array( + array( + "pay_amount"=>10000, + "game_id"=>77, + "game_name"=>"帝王的纷争(安卓版)", + "second_ratio"=>40, + "first_ratio"=>60, + "promote_ratio"=>1, + "fax_ratio"=>1, + "sum_money"=>5880.6, + "statement_begin_time"=>"2019-11-01", + "statement_end_time"=>"2019-11-30", + "statement_type"=>0 + ), + array( + "sum_money"=>2000, + "type_name"=>"罚款", + "statement_type"=>1 + ) + ); + $arr = array( + "statement_type"=>0, + "company_id"=>3, + "company_name"=>'福州品象网络科技有限公司', + "link_phone"=>'18959188422', + "statement_begin_time"=>'1572537600', + "statement_end_time"=>'1575129599', + 'create_time'=>'1578397556', + "statement_money"=>3880.6, + "is_confirm"=>0, + "pay_type"=>0, + "first_party_info"=>json_encode($mycompany,JSON_UNESCAPED_UNICODE), + "second_party_info"=>json_encode($cpcompany,JSON_UNESCAPED_UNICODE), + "statement_info"=>json_encode($statement,JSON_UNESCAPED_UNICODE) + ); + $res = M("statement","tab_")->add($arr); + dd($res); + } + +} diff --git a/Application/Admin/View/Statement/createCpStatement.html b/Application/Admin/View/Statement/createCpStatement.html new file mode 100644 index 000000000..1518cc5c8 --- /dev/null +++ b/Application/Admin/View/Statement/createCpStatement.html @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+ 海南万盟天下科技有限公司 +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
甲方: +
+ +
+
联系人： + +
联系电话： + +
邮寄地址： + +
公司税号： + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
乙方: +
+ +
+
联系人： + +
联系电话： + +
邮寄地址： + +
公司税号： + +
+
+
+
+
+

支付给:

+
+
+ +
+
+
+
+

请选择需要生成结算订单的月份:

+
+
+ +  -  +
+ + +
+
+
+ 生成 +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
结算时间产品平台总额分成比例渠道费率税费费率结算金额
甲方乙方结算金额=平台总额*（1-渠道费）*分成比例*(1-税费费率)
+ 请先选择生成条件后点击生成对账数据 +
+
+
+
+
+ + + + + + + + + + + + + + + +
收款方名称: + +
银行账号： + +
开户行： + +
+
+
+ + + + + + + + + + + + + + + +
付款方名称： + +
银行账号： + +
开户行： + +
+
+
+
+
+ 生成对账单 +
+
+ + + + + + + + diff --git a/Data/update.sql b/Data/update.sql index 0556fbc7d..f8d93b7b5 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -946,6 +946,28 @@ CREATE TABLE `tab_promote_belong` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推广公会归属管理'; - +-- cp/公会对账单 2020-1-7 陈志 +CREATE TABLE `tab_statement` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `statement_type` tinyint(2) DEFAULT '0' COMMENT '对账类型(0-上游对账单;1-下游对账单)', + `company_id` int(11) DEFAULT '0' COMMENT '对账公司id', + `company_name` varchar(60) NOT NULL COMMENT '对账公司名称', + `link_phone` varchar(24) DEFAULT NULL COMMENT '对账公司联系人电话', + `statement_begin_time` int(11) NOT NULL DEFAULT '0' COMMENT '对账开始时间', + `statement_end_time` int(11) NOT NULL DEFAULT '0' COMMENT '对账截止时间', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建对账单时间', + `statement_money` decimal(10,2) DEFAULT '0.00' COMMENT '对账金额', + `pay_amount` decimal(10,2) DEFAULT '0.00' COMMENT '平台金额合计(已减罚款)', + `is_confirm` tinyint(2) DEFAULT '0' COMMENT '是否确认(0-未确认;1-确认)', + `pay_type` tinyint(2) DEFAULT '0' COMMENT '收款方(0-甲方付给乙方,乙方收款;1-乙方付给甲方,甲方收款)', + `ext_field` varchar(50) DEFAULT '' COMMENT '扩展字段，如果是下游为提现单号', + `first_party_info` longtext NOT NULL COMMENT '甲方相关信息json', + `second_party_info` longtext NOT NULL COMMENT '乙方相关信息json', + `statement_info` longtext NOT NULL COMMENT '订单相关信息json', + PRIMARY KEY (`id`), + KEY `statement_type` (`statement_type`), + KEY `company_id` (`company_id`), + KEY `link_phone` (`link_phone`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='cp/公会对账单'; From f87026a32ce5d7d791b47787e2bbab00b78eacf0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 9 Jan 2020 14:38:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AjaxController.class.php | 34 ++ .../Controller/ExportController.class.php | 58 +-- .../StatementMangementController.class.php | 37 ++ .../createDownstreamOrder.html | 406 ++++++++++++++++++ .../Admin/View/StatementMangement/lists.html | 11 +- 5 files changed, 488 insertions(+), 58 deletions(-) create mode 100644 Application/Admin/View/StatementMangement/createDownstreamOrder.html diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index 5d9edbc81..fe5aca488 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -239,4 +239,38 @@ class AjaxController extends ThinkController{ } $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>$lists]); } + + public function getDownstreamData() { + + $withdraw_number = $_REQUEST['withdraw_number']; + + $data = M("withdraw","tab_") + ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio") + ->join("left join tab_promote on tab_withdraw.promote_id=tab_promote.id") + ->join("left join tab_promote_company on tab_promote.company_id=tab_promote_company.id") + ->where(['widthdraw_number'=>$withdraw_number]) + ->find(); + + if ($data['settlement_type']==1) { + $data['settlement_type'] = '周结订单'; + } else if($data['settlement_type']==2){ + $data['settlement_type'] = '月结订单'; + } else { + $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); + } + + } + } + + $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>$data]); + + } + } \ No newline at end of file diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 85c3dfa52..911f4ec86 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -7963,66 +7963,12 @@ class ExportController extends Controller } public function excelUpStreamTemplate() { - header("Content-type: text/html; charset=gb2312"); - error_reporting(E_ALL); - ini_set('display_errors', TRUE); - ini_set('display_startup_errors', TRUE); - - define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); - - date_default_timezone_set('Europe/London'); - Vendor("PHPExcel.PHPExcel"); - $objPHPExcel = new \PHPExcel(); - $objReader = \PHPExcel_IOFactory::createReader('Excel5'); - - //设置模板文件 - $objPHPExcel = $objReader->load("Runtime/upstream.xls"); - - - $objPHPExcel->getActiveSheet()->setCellValue('D2', 'chengzhi'); - - $objPHPExcel->getActiveSheet()->insertNewRowBefore(10,1)->mergeCells('J10:K10')->insertNewRowBefore(10,1)->mergeCells('J10:K10'); - - - ob_end_clean();//清除缓冲区,避免乱码 - header('pragma:public'); - header('Content-type:application/vnd.ms-excel;charset=utf-8;name="15415.xls"'); - header("Content-Disposition:attachment;filename=15415.xls");//attachment新窗口打印inline本窗口打印 - $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); - $objWriter->save('php://output'); - exit; + excelUpStreamTemplate(); } public function excelDownStreamTemplate() { - header("Content-type: text/html; charset=gb2312"); - error_reporting(E_ALL); - ini_set('display_errors', TRUE); - ini_set('display_startup_errors', TRUE); - - define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); - - date_default_timezone_set('Europe/London'); - Vendor("PHPExcel.PHPExcel"); - $objPHPExcel = new \PHPExcel(); - $objReader = \PHPExcel_IOFactory::createReader('Excel5'); - - //设置模板文件 - $objPHPExcel = $objReader->load("upstream.xls"); - - - $objPHPExcel->getActiveSheet()->setCellValue('D2', 'chengzhi'); - - $objPHPExcel->getActiveSheet()->insertNewRowBefore(10,1); - - - ob_end_clean();//清除缓冲区,避免乱码 - header('pragma:public'); - header('Content-type:application/vnd.ms-excel;charset=utf-8;name="15415.xls"'); - header("Content-Disposition:attachment;filename=15415.xls");//attachment新窗口打印inline本窗口打印 - $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); - $objWriter->save('php://output'); - exit; + excelDownStreamTemplate(); } diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 9a529ce84..5748e6205 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -51,4 +51,41 @@ class StatementMangementController extends ThinkController } + public function createDownstreamOrder() { + + $this->display(); + + } + + 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']; + + $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; + $insert['create_time'] = time(); + $insert['statement_money'] =$sumData['statement_money']; + $insert['pay_amount'] = $sumData['pay_amount']; + $insert['ext_field'] = 0; + $insert['first_party_info'] = 0; + $insert['second_party_info'] = 0; + $insert['statement_info'] = 0; + + + + + dump(json_encode($second_party_info)); + dump(json_encode($first_party_info)); + dump(json_encode($statement_info)); + + + } + } diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html new file mode 100644 index 000000000..37b317b05 --- /dev/null +++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html @@ -0,0 +1,406 @@ + + + + + + + 充值查询列表|----软件管理平台 + + + + + + + + + + + +
+ + + + + +
+ +
+ + + +
+ 提现单号： + +
+
+ 银行账号： + +
+ +
+ 乙 方：       + +
+
+ 开 户 行：  + +
+ +
+ 订单类型：  + + 默认 + +
+
+ 邮寄地址： + +
+ +
+ 联 系 人：    + +
+
+ 开票项目： + +
+ +
+ 联系电话：   + +
+
+ 发票类型： + +
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
结算时间合作产品平台总额分成比例税费费率结算金额（元）
aOh! 暂时还没有内容!
+
+
+
+ +
+ + + +
+ 甲方：       + + 海南万盟天下科技有限公司 +
+
+ 联系人：    + +
+ +
+ 联系电话： + +
+
+
+
+ +
+
+ 生成结算订单 +
+
+
+ +
+ {$_page|default=''} +
+
+ + + \ No newline at end of file diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index 414192cbc..a58d7e442 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -38,6 +38,13 @@ .butnbox .butnlist .butn.last {background:#009900;} .butnbox .butnlist .butn~.butn {margin-left:20px;} .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;} + .layui-layer-title { + text-align: center; + height: 80px; + line-height: 80px; + font-weight: 600; + font-size: 18px; + }
@@ -196,11 +203,11 @@ $("#downstream").click(function () { layer.open({ type: 2, - title: "【游戏角色】列表", + title: "海南万盟天下科技有限公司", shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: ['/admin.php?s=/Member/role_list/' , 'no'] + content: '/admin.php?s=/statementMangement/createDownstreamOrder/' }); }); From 0934cd472ab8e53711839e3e50bda117dd057dee Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 9 Jan 2020 14:50:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecp=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E5=88=B0=E5=88=97=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/Statement/createCpStatement.html | 11 +++++------ Application/Admin/View/StatementMangement/lists.html | 9 ++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Application/Admin/View/Statement/createCpStatement.html b/Application/Admin/View/Statement/createCpStatement.html index 1518cc5c8..64af44166 100644 --- a/Application/Admin/View/Statement/createCpStatement.html +++ b/Application/Admin/View/Statement/createCpStatement.html @@ -83,9 +83,9 @@ -
+
@@ -525,7 +525,6 @@ }, createStatement(){ $("#createStatement").on("click",function(){ - alert(1); //验证信息 for (const key in DATAOBJ) { if(DATAOBJ[key] === false){ @@ -570,10 +569,10 @@ PUBLIC.postData("{:U('doAddCpStatement')}",DATAOBJ,function(data){ if(data.success){ + layer.closeAll('loading'); + layer.msg('添加成功'); setTimeout(function(){ - layer.closeAll('loading'); - layer.msg('添加成功'); - // + window.parent.reload(); },350); }else{ alert("添加失败，请联系管理员") diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index a58d7e442..35e12c5ba 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -177,7 +177,10 @@