From 2fe7c864dfc05a04b2a6f6b0197a88b0041c4f46 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 22 Jul 2020 14:43:35 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CpJuheCompanyController.class.php | 87 +++++ .../Admin/View/CpJuheCompany/detail.html | 272 +++++++++++++ .../Admin/View/CpJuheCompany/export.html | 314 +++++++++++++++ .../Admin/View/CpJuheCompany/index.html | 359 ++++++++++++++++++ 4 files changed, 1032 insertions(+) create mode 100644 Application/Admin/Controller/CpJuheCompanyController.class.php create mode 100644 Application/Admin/View/CpJuheCompany/detail.html create mode 100644 Application/Admin/View/CpJuheCompany/export.html create mode 100644 Application/Admin/View/CpJuheCompany/index.html diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php new file mode 100644 index 000000000..9f46822df --- /dev/null +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -0,0 +1,87 @@ +field("value")->where(['key'=>"cp_company_api"])->find(); + + $data = json_decode(curl_post($url['value'],$request),true); +// dump($request);die(); + + if($_REQUEST['export']) { + $list_data = $data['data']; + foreach ($list_data as $key => $value) { + $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true); + $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true); + + $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['start_time']); + ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = ""); + + $list_data[$key]['balance_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['start_time']); + ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = ""); + } + + $this->assign("listdata",$list_data); + + $this->display("export");die(); + } else { + $page = set_pagination($data['count'], $row); + if ($page) { + $this->assign('_page', $page); + } + $this->assign("listdata",$data['data']); + $this->display(); + } + + + + } + + + public function detail() { + + $_REQUEST['id']?($request['id'] = $_REQUEST['id']):''; + + $data = json_decode(curl_post("http://10.0.1.161:8095/index.php?g=Api&m=CpJuheCompany&a=detail",$request),true); + + $this->assign("data",$data); + $this->display(); + + } + + +} + diff --git a/Application/Admin/View/CpJuheCompany/detail.html b/Application/Admin/View/CpJuheCompany/detail.html new file mode 100644 index 000000000..8e4e219fb --- /dev/null +++ b/Application/Admin/View/CpJuheCompany/detail.html @@ -0,0 +1,272 @@ + + + + + + + +
+ +
+ +
+
+

聚合公司详情

+

说明：查看聚合公司详情信息

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
合作方 + {$data['name']} +
登录账号 + {$data['code']} +
联系邮箱 + {$data['user_email']} +
联系手机 + {$data['mobile']} +
状态 + 正常禁用未验证 +
备注 +
对应平台 + {$data['platform']} +
合同期限 + {$data['agreement_time']['start_time']} + +   —   + + {$data['agreement_time']['end_time']|default="永久"} +   说明：结束时间不填为永久时间 +
结算生效期限 + {$data['balance_time']['start_time']} + +   —   + {$data['balance_time']['end_time']|default="永久"} + +   说明：结束时间不填为永久时间 +
开票税点 + {$data['tax_point']} +   % +
公司性质 + 个人公司 +
是否签署合同 + 否是 +
是否为收款方 + 否是 +
联系人 + {$data['connection_person']} +
联系电话 + {$data['phone']} +
联系地址 + {$data['connection_address']} +
注册地址 + {$data['register_address']}% +
注册电话 + {$data['register_phone']} +
邮寄地址 + {$data['send_address']} +
账户名 + {$data['bank_user']} +
银行卡号 + {$data['bank_card']} +
收款银行 + {$data['bank_name']} +
支付宝账户 + {$data['alipay_user']} +
承担服务费 + 否是 + + + {$data['service_cost']} + +   元 +
税费费率 + {$data['tax_ratio']|default=0}% +
渠道费率 + {$data['channel_radio']|default=0}% +
发票类型 + {$data['invoice_type']} +
开票内容 + {$data['invoice_item']} +
纳税人识别号 + {$data['tax_identification_number']} +
合作状态 + 合作中停止合作 +
显示状态 + 开启关闭 +
+
+ + + + 返回 + +
+
+
+
+
+
+
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + if(C('COLOR_STYLE')=='blue_color') echo ' + + '; + + + + + + + + diff --git a/Application/Admin/View/CpJuheCompany/export.html b/Application/Admin/View/CpJuheCompany/export.html new file mode 100644 index 000000000..9caa77ddb --- /dev/null +++ b/Application/Admin/View/CpJuheCompany/export.html @@ -0,0 +1,314 @@ + + + + + + 游戏登陆列表|----软件管理平台 + + + + + + + + + + + + + + + +
+ 导出进行中。。。
+ 如果导出成功你也可以手动关闭此页面 +
+ + + + + + + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + + \ No newline at end of file diff --git a/Application/Admin/View/CpJuheCompany/index.html b/Application/Admin/View/CpJuheCompany/index.html new file mode 100644 index 000000000..d687d2ac4 --- /dev/null +++ b/Application/Admin/View/CpJuheCompany/index.html @@ -0,0 +1,359 @@ + + + + + + + + +
+ +

下游聚合公司列表

+ + + + + + +
+ +
+ + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + + +
+ 搜索 + 导出 +
+
+
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
合作方名称对应平台公司性质原包名现包名聚合包名产品类型结算周期游戏分成比例账户名银行账号开户行支付宝账号操作
{$vo.name|default="------"}{$vo.platform|default="------"}{$vo.company_properties|default="------"}{$vo['original_package_name'][0]|default="------"}{$vo['game_name'][0]|default="------"}{$vo['game_name'][0]|default="------"}{$vo['game_type'][0]|default="------"}{$vo['withdraw_type'][0]|default="------"}默认{$vo['rate_data'][0][0]['exploitation_rate']|default="0"}{$vo.bank_user|default="------"}{$vo.bank_card|default="------"}{$vo.bank_name|default="------"}{$vo.alipay_user|default="------"} + 查看 +
{$vo['original_package_name'][$index-1]|default="------"}{$vo['game_name'][$index-1]|default="------"}{$vo['game_name'][$index-1]|default="------"}{$vo['game_type'][$index-1]|default="------"}{$vo['withdraw_type'][$index-1]|default="------"}{$vo['rate_data'][$index-1][0]['exploitation_name']}{$vo['rate_data'][$index-1][0]['exploitation_rate']}
{$rate.exploitation_name}{$rate.exploitation_rate}
+
+ +
+
+ {$_page|default=''} +
+ + + + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + From 341fa19b6faaa2abd74b5f4153dffaa255ca978e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 22 Jul 2020 14:52:56 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index d2a649338..d480eb7b7 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2805,5 +2805,27 @@ function promote_listsMarket($type){ $data[$key] = $item; } + return $data; +} + +/** + * 聚合公司筛选项 + * @param $type 1 渠道 2 包名获取 + * @return mixed + */ +function getCpCompanySelect($type = 1){ + + $request['req'] = 1; + + if ($type == 1) { + $url = M("kv")->field("value")->where(['key'=>"cp_company_channel_api"])->find(); + $data = json_decode(curl_post($url['value'],$request),true); + } elseif($type == 2) { + $url = M("kv")->field("value")->where(['key'=>"cp_company_gamename_api"])->find(); + $data = json_decode(curl_post($url['value'],$request),true); + } else { + return []; + } + return $data; } \ No newline at end of file From 1fff2e6c09b3fae64acdb169301ec41b457df116 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 22 Jul 2020 15:32:36 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=90=AC=E5=88=B0=E6=96=B0=E7=9A=84=E5=88=86=E6=94=AF=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceSetController.class.php | 297 ++++++++++-------- ...regateFinanceStatementController.class.php | 34 +- .../Admin/Model/PromoteModel.class.php | 4 +- Public/Admin/excel/aggregate_stream.xls | Bin 26624 -> 24576 bytes 4 files changed, 201 insertions(+), 134 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceSetController.class.php b/Application/Admin/Controller/AggregateFinanceSetController.class.php index ce6c7febe..da422bfd9 100644 --- a/Application/Admin/Controller/AggregateFinanceSetController.class.php +++ b/Application/Admin/Controller/AggregateFinanceSetController.class.php @@ -101,133 +101,184 @@ class AggregateFinanceSetController extends Controller { $this->getAndSaveData(2,$begintime,$endtime); } - protected function getAndSaveData($type,$begintime,$endtime) - { - $sign = md5($begintime.$endtime.$type.$this->token); - $arr = [ - "begintime"=>$begintime, - "endtime"=>$endtime, - "type"=>$type, - "sign"=>$sign - ]; - $dataurl .= $this->apihost."&".http_build_query($arr); - $html = file_get_contents($dataurl); - $rsp = json_decode($html,true); - if($rsp['code'] != 1){ - echo $rsp['error'].PHP_EOL;die; - } - //成功插入 - $Aggregate = M("aggregate_statement","tab_"); - $begintimestr = date("Y-m-d",$begintime); - $endtimestr = date("Y-m-d",$endtime); - if($rsp['count'] > 0){ - //插入数据 - foreach ($rsp['data'] as $k => $v) { - foreach ($v["game_list"] as $ke => &$va) { - $va['begintime'] = $begintimestr; - $va['endtime'] = $endtimestr; - $va['fax_ratio'] = 0; - } - $v["statement_info"] = json_encode($v["game_list"],JSON_UNESCAPED_UNICODE); - unset($v["game_list"]); - $v['begintime'] = $begintime; - $v['endtime'] = $endtime; - $v['create_time'] = time(); - $v['admin_name'] = "system"; - $v['admin_id'] = 0; - $v['second_party_info'] = json_encode([ - "partner"=>$v['channel_name'] - ],JSON_UNESCAPED_UNICODE); - $Aggregate->add($v); - } - } - - if($type == 0){ - echo "----周结统计ok".PHP_EOL; - }elseif($type == 1){ - echo "----月结统计ok".PHP_EOL; - }elseif($type == 2){ - echo "----补点统计ok".PHP_EOL; - } - } + protected function getAndSaveData($type,$begintime,$endtime) + { + $sign = md5($begintime.$endtime.$type.$this->token); + $arr = [ + "begintime"=>$begintime, + "endtime"=>$endtime, + "type"=>$type, + "sign"=>$sign + ]; + $dataurl .= $this->apihost."&".http_build_query($arr); + $html = file_get_contents($dataurl); +// echo $dataurl;die(); + sleep(5); + $rsp = json_decode($html,true); + if($rsp['code'] != 1){ + echo $rsp['error'].PHP_EOL;die; + } + //成功插入 + $Aggregate = M("aggregate_statement","tab_"); + $begintimestr = date("Y-m-d",$begintime); + $endtimestr = date("Y-m-d",$endtime); + if($rsp['count'] > 0){ + //插入数据 + foreach ($rsp['data'] as $k => $v) { + foreach ($v["game_list"] as $ke => &$va) { + $va['begintime'] = $begintimestr; + $va['endtime'] = $endtimestr; + $va['fax_ratio'] = 0; + } + $v["statement_info"] = json_encode($v["game_list"],JSON_UNESCAPED_UNICODE); + unset($v["game_list"]); + $v['begintime'] = $begintime; + $v['endtime'] = $endtime; + $v['create_time'] = time(); + $v['admin_name'] = "system"; + $v['admin_id'] = 0; + $v['second_party_info'] = + json_encode([ + "partner"=>$v['channel_name'], + "invoice_type"=>$v['invoice_type'], + "invoice_item"=>$v['invoice_item'], + "company_tax_no"=>$v['tax_identification_number'], + "link_man"=>$v['connection_person'], + "link_phone"=>$v['phone'], + "address"=>$v['send_address'], + "register_address"=>$v['register_address'], + "register_phone"=>$v['register_phone'], + "payee_name"=>$v['bank_user'], + "bank_account"=>$v['bank_card'], + "opening_bank"=>$v['bank_name'], + ],JSON_UNESCAPED_UNICODE); + $Aggregate->add($v); + } + } + + if($type == 0){ + echo "----周结统计ok".PHP_EOL; + }elseif($type == 1){ + echo "----月结统计ok".PHP_EOL; + }elseif($type == 2){ + echo "----补点统计ok".PHP_EOL; + } + } /** * 重算聚合接口数据 * @param [type] $id * @return void */ - public function updateAggregateFinanceData($id) - { - //获取基础信息 - $Aggregate = M("aggregate_statement","tab_"); - $info = $Aggregate->where("id='{$id}'")->find(); - $sign = md5($info['begintime'].$info['endtime'].$info['withdraw_type'].$this->token); - $arr = [ - "begintime"=>$info['begintime'], - "endtime"=>$info['endtime'], - "type"=>$info['withdraw_type'], - "sign"=>$sign, - "channel_id"=>$info['channel_id'] - ]; - $dataurl .= $this->apihost."&".http_build_query($arr); - $html = file_get_contents($dataurl); - $rsp = json_decode($html,true); - if($rsp['code'] != 1){ - echo $rsp['error'].PHP_EOL;die; - } - //更新信息 - $begintimestr = date("Y-m-d",$info['begintime']); - $endtimestr = date("Y-m-d",$info['endtime']); - - if($rsp['count'] > 0){ - //插入数据 - foreach ($rsp['data'] as $k => $v) { - foreach ($v["game_list"] as $ke => &$va) { - $va['begintime'] = $begintimestr; - $va['endtime'] = $endtimestr; - $va['fax_ratio'] = 0; - } - $v["statement_info"] = json_encode($v["game_list"],JSON_UNESCAPED_UNICODE); - unset($v["game_list"]); - $v['create_time'] = time(); - $v['admin_name'] = $_SESSION['onethink_admin']['user_auth']['username']; - $v['admin_id'] = $_SESSION['onethink_admin']['user_auth']['uid']; - $v['verify_status'] = 0; - - $first_party_info = json_decode($info['first_party_info'], 1); - if($first_party_info['partner'] == $info['channel_name']){ - $v['second_party_info'] = $info['first_party_info']; - $v['first_party_info'] = $info['second_party_info']; - $v['pay_type'] =0; - } - - $res = $Aggregate->where("id='{$id}'")->save($v); - if(empty($res)){ - return false; - } - } - }else{ - $savedata = [ - "create_time"=>time(), - "admin_name"=>$_SESSION['onethink_admin']['user_auth']['username'], - "admin_id"=>$_SESSION['onethink_admin']['user_auth']['uid'], - "verify_status"=>0, - "statement_info"=>json_encode([],JSON_UNESCAPED_UNICODE), - "ratio_money"=>0, - "pay_money"=>0 - ]; - - $first_party_info = json_decode($info['first_party_info'], 1); - if($first_party_info['partner'] == $info['channel_name']){ - $savedata['second_party_info'] = $info['first_party_info']; - $savedata['first_party_info'] = $info['second_party_info']; - $savedata['pay_type'] =0; - } + public function updateAggregateFinanceData($id) + { + //获取基础信息 + $Aggregate = M("aggregate_statement","tab_"); + $info = $Aggregate->where("id='{$id}'")->find(); + $sign = md5($info['begintime'].$info['endtime'].$info['withdraw_type'].$this->token); + $arr = [ + "begintime"=>$info['begintime'], + "endtime"=>$info['endtime'], + "type"=>$info['withdraw_type'], + "sign"=>$sign, + "channel_id"=>$info['channel_id'] + ]; + $dataurl .= $this->apihost."&".http_build_query($arr); + $html = file_get_contents($dataurl); + $rsp = json_decode($html,true); + if($rsp['code'] != 1){ + echo $rsp['error'].PHP_EOL;die; + } + //更新信息 + $begintimestr = date("Y-m-d",$info['begintime']); + $endtimestr = date("Y-m-d",$info['endtime']); - $res = $Aggregate->where("id='{$id}'")->save($savedata); - if(empty($res)){ - return false; - } - } - return true; - } + if($rsp['count'] > 0){ + //插入数据 + foreach ($rsp['data'] as $k => $v) { + foreach ($v["game_list"] as $ke => &$va) { + $va['begintime'] = $begintimestr; + $va['endtime'] = $endtimestr; + $va['fax_ratio'] = 0; + } + $v["statement_info"] = json_encode($v["game_list"],JSON_UNESCAPED_UNICODE); + unset($v["game_list"]); + $v['create_time'] = time(); + $v['admin_name'] = $_SESSION['onethink_admin']['user_auth']['username']; + $v['admin_id'] = $_SESSION['onethink_admin']['user_auth']['uid']; + $v['verify_status'] = 0; + +// $first_party_info = json_decode($info['first_party_info'], 1); +// if($first_party_info['partner'] == $info['channel_name']){ + + $v['second_party_info'] = + json_encode([ + "partner"=>$v['channel_name'], + "invoice_type"=>$v['invoice_type'], + "invoice_item"=>$v['invoice_item'], + "company_tax_no"=>$v['tax_identification_number'], + "link_man"=>$v['connection_person'], + "link_phone"=>$v['phone'], + "address"=>$v['send_address'], + "register_address"=>$v['register_address'], + "register_phone"=>$v['register_phone'], + "payee_name"=>$v['bank_user'], + "bank_account"=>$v['bank_card'], + "opening_bank"=>$v['bank_name'], + ],JSON_UNESCAPED_UNICODE); + + $v['first_party_info'] = ''; + + $v['pay_type'] =0; +// } else { +// $v['second_party_info'] = +// json_encode([ +// "partner"=>$v['channel_name'], +// "invoice_type"=>$v['invoice_type'], +// "invoice_item"=>$v['invoice_item'], +// "company_tax_no"=>$v['tax_identification_number'], +// "link_man"=>$v['connection_person'], +// "link_phone"=>$v['phone'], +// "address"=>$v['send_address'], +// "register_address"=>$v['register_address'], +// "register_phone"=>$v['register_phone'], +// "payee_name"=>$v['bank_user'], +// "bank_account"=>$v['bank_card'], +// "opening_bank"=>$v['bank_name'], +// ],JSON_UNESCAPED_UNICODE); +// +// $v['pay_type'] =1; +// } + + + $res = $Aggregate->where("id='{$id}'")->save($v); + if(empty($res)){ + return false; + } + } + }else{ + $savedata = [ + "create_time"=>time(), + "admin_name"=>$_SESSION['onethink_admin']['user_auth']['username'], + "admin_id"=>$_SESSION['onethink_admin']['user_auth']['uid'], + "verify_status"=>0, + "statement_info"=>json_encode([],JSON_UNESCAPED_UNICODE), + "ratio_money"=>0, + "pay_money"=>0 + ]; + + $first_party_info = json_decode($info['first_party_info'], 1); + if($first_party_info['partner'] == $info['channel_name']){ + $savedata['second_party_info'] = $info['first_party_info']; + $savedata['first_party_info'] = $info['second_party_info']; + + $savedata['pay_type'] =0; + } + + $res = $Aggregate->where("id='{$id}'")->save($savedata); + if(empty($res)){ + return false; + } + } + return true; + } } diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 8de0b0f1d..f8cb7758b 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -532,9 +532,9 @@ class AggregateFinanceStatementController extends ThinkController 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('Asia/Shanghai'); Vendor("PHPExcel.PHPExcel"); $objPHPExcel = new \PHPExcel(); @@ -543,7 +543,7 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel = $objReader->load("Public/Admin/excel/aggregate_stream.xls"); $statement_begin_time = date('Y.m.d', $data['begintime']);//对账开始时间 $statement_end_time = date('Y.m.d',$data['endtime']);//对账截止时间 - + $objPHPExcel->getActiveSheet()->getStyle('A1')->getAlignment()->setWrapText(true); $objPHPExcel->getActiveSheet()->setCellValue('A1', "《 {$data['channel_name']} 》结算单\n（{$statement_begin_time}-{$statement_end_time}）"); if ($data['withdraw_type'] == '2') { @@ -576,17 +576,33 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['first_party_info']['partner']);//甲方 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['first_party_info']['link_man']);//联系人 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['first_party_info']['link_phone']);//联系电话 - $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['second_party_info']['invoice_item']);//开票项目 - $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['second_party_info']['invoice_type']);//发票类型 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['first_party_info']['address']);//邮寄地址 +// $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['second_party_info']['invoice_type']);//发票类型 //乙方信息 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['second_party_info']['partner']);//乙方 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['second_party_info']['link_man']);//联系人 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['second_party_info']['link_phone']);//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['second_party_info']['address']);//邮寄地址 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行 + //开票信息 + $invoice_data = "发票类型：".$data['second_party_info']['invoice_type']; + $invoice_data .= "\n发票抬头：".$data['second_party_info']['partner']; + $invoice_data .= "\n纳税人识别号：".$data['second_party_info']['company_tax_no']; + + $invoice_data .= "\n开户银行：".$data['second_party_info']['opening_bank']; + $invoice_data .= "\n开户账号：".$data['second_party_info']['payee_name']; + $invoice_data .= "\n开票内容：".$data['second_party_info']['invoice_item']; + $invoice_data .= "\n注册地址及电话：".$data['second_party_info']['register_address'].",".$data['second_party_info']['register_phone']; + + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $invoice_data);//乙方 + + $first_data = "户名：{$data['pay_company']['payee_name']}"; + $first_data .= "\n账号：{$data['pay_company']['bank_account']}"; + $first_data .= "\n开户行：{$data['pay_company']['opening_bank']}"; + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+8), $first_data);//户名 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行 if($data['withdraw_type'] == 1){ $m = date('Y.m', $data['begintime']); $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$m}"; @@ -598,7 +614,7 @@ class AggregateFinanceStatementController extends ThinkController header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls'); header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印 $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); - $objWriter->save('php://output'); + $objWriter->save('php://output'); } //获取权限 public function getAuth() diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index f015a4e4d..3370b1e4f 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -442,9 +442,9 @@ class PromoteModel extends Model{ if(!$show_data_power){ - $parseData[$key]['account'] = encryptStr($parseData[$key]['account']); +// $parseData[$key]['account'] = encryptStr($parseData[$key]['account']); $parseData[$key]['mobile_phone'] = encryptStr($parseData[$key]['mobile_phone']); - $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']); +// $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']); } diff --git a/Public/Admin/excel/aggregate_stream.xls b/Public/Admin/excel/aggregate_stream.xls index c34f0dfbe3923e5a09daeb5df96dadfa18fe80cd..c55d4cdf8385bb3106ac88a7c867ecb879c9a616 100644 GIT binary patch delta 7444 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 LZ7KspvYGz_53
Date: Thu, 23 Jul 2020 14:15:51 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CpJuheCompany/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CpJuheCompany/detail.html b/Application/Admin/View/CpJuheCompany/detail.html index 8e4e219fb..85459b8ff 100644 --- a/Application/Admin/View/CpJuheCompany/detail.html +++ b/Application/Admin/View/CpJuheCompany/detail.html @@ -180,7 +180,7 @@ 否是 - {$data['service_cost']} + 服务费:{$data['service_cost']}   元 From 68f8bb1ce0b534e8a5fd8d797854d179eb7a5f00 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 23 Jul 2020 17:18:37 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CpJuheCompany/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CpJuheCompany/detail.html b/Application/Admin/View/CpJuheCompany/detail.html index 85459b8ff..ed82a2316 100644 --- a/Application/Admin/View/CpJuheCompany/detail.html +++ b/Application/Admin/View/CpJuheCompany/detail.html @@ -132,7 +132,7 @@ 注册地址 - {$data['register_address']}% + {$data['register_address']} From 5bbdfe7e748ba5467b9d53132c6a8ebd4e2d715e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 23 Jul 2020 18:03:58 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CpJuheCompanyController.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php index 9f46822df..6fc9d3259 100644 --- a/Application/Admin/Controller/CpJuheCompanyController.class.php +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -44,6 +44,15 @@ class CpJuheCompanyController extends ThinkController { if($_REQUEST['export']) { $list_data = $data['data']; foreach ($list_data as $key => $value) { + + if ($list_data[$key]['bank_card']){ + $list_data[$key]['bank_card'] = '`'.$list_data[$key]['bank_card']; + } + + if ($list_data[$key]['alipay_user']) { + $list_data[$key]['alipay_user'] = '`'.$list_data[$key]['alipay_user']; + } + $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true); $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true); From 4325ed23ee6f15ab41081a61e8d34c85feef895a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 24 Jul 2020 09:21:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AF=A6=E7=BB=86=E7=BD=91=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CpJuheCompanyController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php index 6fc9d3259..1b535a326 100644 --- a/Application/Admin/Controller/CpJuheCompanyController.class.php +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -83,8 +83,8 @@ class CpJuheCompanyController extends ThinkController { public function detail() { $_REQUEST['id']?($request['id'] = $_REQUEST['id']):''; - - $data = json_decode(curl_post("http://10.0.1.161:8095/index.php?g=Api&m=CpJuheCompany&a=detail",$request),true); + $url = M("kv")->field("value")->where(['key'=>"cp_company_api"])->find(); + $data = json_decode(curl_post($url['value'],$request),true); $this->assign("data",$data); $this->display(); From 52fe6d04f8dee1bb5009f70260fc2a3bab319f12 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 24 Jul 2020 09:30:07 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AF=A6=E7=BB=86=E7=BD=91=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/CpJuheCompanyController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php index 1b535a326..4a7e556be 100644 --- a/Application/Admin/Controller/CpJuheCompanyController.class.php +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -83,7 +83,7 @@ class CpJuheCompanyController extends ThinkController { public function detail() { $_REQUEST['id']?($request['id'] = $_REQUEST['id']):''; - $url = M("kv")->field("value")->where(['key'=>"cp_company_api"])->find(); + $url = M("kv")->field("value")->where(['key'=>"cp_company_detail_api"])->find(); $data = json_decode(curl_post($url['value'],$request),true); $this->assign("data",$data); From 815e2e3b8874bc8dfafc278dc80c9bd374b79473 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 24 Jul 2020 16:33:22 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CpJuheCompanyController.class.php | 12 ++++++------ Application/Admin/View/CpJuheCompany/export.html | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php index 4a7e556be..ff88651ba 100644 --- a/Application/Admin/Controller/CpJuheCompanyController.class.php +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -46,21 +46,21 @@ class CpJuheCompanyController extends ThinkController { foreach ($list_data as $key => $value) { if ($list_data[$key]['bank_card']){ - $list_data[$key]['bank_card'] = '`'.$list_data[$key]['bank_card']; + $list_data[$key]['bank_card'] = ' '.$list_data[$key]['bank_card']; } if ($list_data[$key]['alipay_user']) { - $list_data[$key]['alipay_user'] = '`'.$list_data[$key]['alipay_user']; + $list_data[$key]['alipay_user'] = ' '.$list_data[$key]['alipay_user']; } $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true); $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true); - $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['start_time']); - ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = ""); + $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']); + ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = ""); - $list_data[$key]['balance_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['start_time']); - ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = ""); + $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']); + ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = ""); } $this->assign("listdata",$list_data); diff --git a/Application/Admin/View/CpJuheCompany/export.html b/Application/Admin/View/CpJuheCompany/export.html index 9caa77ddb..ae58f2217 100644 --- a/Application/Admin/View/CpJuheCompany/export.html +++ b/Application/Admin/View/CpJuheCompany/export.html @@ -158,10 +158,10 @@ {$vo.before_amount|default="0"} {$vo.is_contract|default="------"} - {$vo['agreement_time']['start_time']}  —   + {$vo['agreement_time']['start_time']}— {$vo['agreement_time']['end_time']|default="永久"} - {$vo['balance_time']['start_time']}  —   + {$vo['balance_time']['start_time']}— {$vo['balance_time']['end_time']|default="永久"} {$vo['tax_point']}% From 91178308f92cf4b0939fc627cf864b115657fa75 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 27 Jul 2020 14:14:06 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=B8=8B=E6=B8=B8=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8E=E4=B8=8A=E6=B8=B8=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CpJuheCompanyController.class.php | 33 ++++++++++++++++--- .../Admin/View/CpJuheCompany/export.html | 6 ++++ Data/update.sql | 5 ++- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/CpJuheCompanyController.class.php b/Application/Admin/Controller/CpJuheCompanyController.class.php index ff88651ba..e8163b535 100644 --- a/Application/Admin/Controller/CpJuheCompanyController.class.php +++ b/Application/Admin/Controller/CpJuheCompanyController.class.php @@ -56,11 +56,36 @@ class CpJuheCompanyController extends ThinkController { $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true); $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true); - $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']); - ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = ""); +// $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']); +// ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = ""); +// +// $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']); +// ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = ""); + + if ($list_data[$key]['agreement_time']['start_time']) { + $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['start_time']); + } else { + $list_data[$key]['agreement_time']['start_time'] = "未设置"; + } + + if($list_data[$key]['agreement_time']['end_time']) { + ($list_data[$key]['agreement_time']['end_time'] != 1) ? ($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['end_time'])) : ($list_data[$key]['agreement_time']['end_time'] = ""); + } else { + $list_data[$key]['agreement_time']['end_time'] = "未设置"; + } + + if ($list_data[$key]['balance_time']['start_time']) { + $list_data[$key]['balance_time']['start_time'] = date("Y-m-d", $list_data[$key]['balance_time']['start_time']); + } else { + $list_data[$key]['balance_time']['start_time'] = "未设置"; + } + + if($list_data[$key]['balance_time']['end_time']) { + ($list_data[$key]['balance_time']['end_time'] != 1) ? ($list_data[$key]['balance_time']['end_time'] = date("Y-m-d", $list_data[$key]['balance_time']['end_time'])) : ($list_data[$key]['balance_time']['end_time'] = ""); + } else { + $list_data[$key]['balance_time']['end_time'] = "未设置"; + } - $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']); - ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = ""); } $this->assign("listdata",$list_data); diff --git a/Application/Admin/View/CpJuheCompany/export.html b/Application/Admin/View/CpJuheCompany/export.html index ae58f2217..391b1cb58 100644 --- a/Application/Admin/View/CpJuheCompany/export.html +++ b/Application/Admin/View/CpJuheCompany/export.html @@ -112,6 +112,9 @@ 是否有预付款 预付款金额 是否签署合同 + + 是否具有游戏资质 + 合同期限 生效时间 开票税点 @@ -157,6 +160,9 @@ {$vo.is_surplus|default="否"} {$vo.before_amount|default="0"} {$vo.is_contract|default="------"} + + {$vo.is_qualifity|default="否"} + {$vo['agreement_time']['start_time']}— {$vo['agreement_time']['end_time']|default="永久"} diff --git a/Data/update.sql b/Data/update.sql index 5ed891243..aeabc2871 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2117,4 +2117,7 @@ CREATE TABLE `tab_market_altogether` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic; -INSERT INTO `tab_tool`(`id`, `name`, `title`, `config`, `type`, `status`) VALUES (59, 'tax_radio', '公司税费', '{"tax_radio":1.5,"time":1589361782}', 1, 1) \ No newline at end of file +INSERT INTO `tab_tool`(`id`, `name`, `title`, `config`, `type`, `status`) VALUES (59, 'tax_radio', '公司税费', '{"tax_radio":1.5,"time":1589361782}', 1, 1) + +ALTER TABLE `sj_game_channel`.`sj_cptogether_company` +ADD COLUMN `is_qualifity` tinyint(2) NULL COMMENT '是否具有游戏资质 0 否 1 是' AFTER `is_received`; \ No newline at end of file