From 33cf2cf8a62249d94dde6476134dd2efccf73708 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 14 Jul 2020 09:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 74 ++++++++-- .../Admin/Model/PartnerVerifyModel.class.php | 67 +++++++++ Application/Admin/View/Partner/export.html | 2 +- Application/Admin/View/Partner/index.html | 136 +++++++----------- Data/update.sql | 10 +- 5 files changed, 188 insertions(+), 101 deletions(-) create mode 100644 Application/Admin/Model/PartnerVerifyModel.class.php diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index d888de704..6d536a3b5 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -12,7 +12,11 @@ use Think\Controller; class PartnerController extends ThinkController { private $modelName = 'Partner'; - + public function _initialize() + { + $this->admininfo = $_SESSION['onethink_admin']['user_auth']; + parent::_initialize(); + } //列表 public function lists() { @@ -202,37 +206,88 @@ class PartnerController extends ThinkController //审核列表 public function index() { + $page = intval(I('get.p', 0)); + $page = $page ? $page : 1; //默认显示第一页数据 + $row = intval(I('row', 0)); + $row = empty($row) ? 10 : $row;//每页条数 + + $map = ["_string"=>"1=1"]; $model = M("partner_verify", 'tab_'); - $map = []; - // + $data = $model->where($map)->page($page,$row)->select(); + foreach ($data as $k => &$v) { + $v['partner_info'] = json_decode($v['partner_info'],true); + if($v['partner_id'] == 0){ + $v['verify_type'] = "新增"; + }else{ + $v['verify_type'] = "修改"; + } + $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司'; + + $contract_start_time = $v['partner_info']['contract_start_time'] ? + time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-'; + $contract_end_time = $v['partner_info']['contract_end_time'] ? + time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-'; + $v['contract_time'] = $contract_start_time . '-' . $contract_end_time; + + $validity_start_time = $v['partner_info']['validity_start_time'] ? + time_format($v['partner_info']['validity_start_time'], 'Y/m/d') : '-'; + $validity_end_time = $v['partner_info']['validity_end_time'] ? + time_format($v['partner_info']['validity_end_time'], 'Y/m/d') : '-'; + $v['validity_time'] = $validity_start_time . '-' . $validity_end_time; + $create_time = date("Y-m-d H:i:s",$v["create_time"]); + + $v["create"]= "{$v['create_admin_account']}
{$create_time}"; + + if(isset($v['verify_log']['verify_user'])){ + if($v['verify_status'] == -1){ + $ts = "审核拒绝"; + }else{ + $ts = "审核通过"; + } + $v["verify"]= "{$ts}({$v['verify_log']['verify_user']}) {$symbol} {$v['verify_log']['verify_time']}"; + }else{ + $v["verify"] = '--'; + } + + } + $count = $model->where($map)->count(); + $this->assign('listData', $data); + $this->assign('count', $count); + $this->assign('VerifyStatus', D("PartnerVerify")->VerifyStatus); + $this->meta_title = '上游CP审核列表'; $this->display(); } //添加 public function add() { - $model = M($this->modelName, 'tab_');; + $model = M("partner_verify", 'tab_'); if ($_POST) { $save = I("post."); $this->checkData($save); $save['uid'] = UID; $save['create_time'] = time(); - $res = $model->add($save); + + $has_check = M("partner_verify")->where(["partner_name"=>$partner_info['partner'],"verify_status"=>0])->field("id")->find(); + if ($has_check) { + $this->error('已存在同名未审核的cp,请勿重复添加'); + } + + $res =D("PartnerVerify")->add_db($save); if ($res) { - \Think\Log::actionLog('Partner/add', 'partner', $res); //操作日志 addOperationLog(array( "op_type"=>0, "key"=>$save['partner'], "url"=>U("Partner/lists",array("partner"=>$save['partner'])) )); - $this->success('保存成功', U('lists')); + $this->success('保存成功,请联系管理尽快审核', U('lists')); } else { $this->error('保存失败'); } } else { $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/add'])->find()); - $this->meta_title = '新增合作方'; + $this->meta_title = '新增上游CP公司'; $this->display(); } } @@ -245,7 +300,8 @@ class PartnerController extends ThinkController if ($_POST) { $save = I("post."); $this->checkData($save); - $res = $model->save($save); + $res =D("PartnerVerify")->edit_db($save); + // $res = M("partner_verify", 'tab_')->save($verifydata); if ($res === false) { $this->error('保存失败'); } else { diff --git a/Application/Admin/Model/PartnerVerifyModel.class.php b/Application/Admin/Model/PartnerVerifyModel.class.php new file mode 100644 index 000000000..1020bcb47 --- /dev/null +++ b/Application/Admin/Model/PartnerVerifyModel.class.php @@ -0,0 +1,67 @@ +"审核拒绝", + "0"=>"未审核", + "1"=>"审核通过" + ]; + public function getVerifyCompanyInfo($id) + { + + } + /** + * 新增 + * @param [array]] $partner_info 公司信息 + * @return void + */ + public function add_db($partner_info) + { + $verifydata = [ + "partner_id"=>0, + "partner_name"=>$partner_info['partner'], + "verify_status"=>0, + "create_admin_id"=>UID, + "create_admin_account"=>$_SESSION['onethink_admin']['user_auth']['username'], + "create_time"=>time() + ]; + $verifydata['partner_info'] = json_encode($partner_info,JSON_UNESCAPED_UNICODE); + return $this->add($verifydata); + } + public function edit_db($partner_info) + { + if(!isset($partner_info['id'])){ + return false; + } + $p_id = $partner_info['id']; + + $verifydata = [ + "partner_id"=>$p_id, + "partner_name"=>$partner_info['partner'], + "verify_status"=>0, + "create_admin_id"=>UID, + "create_admin_account"=>$_SESSION['onethink_admin']['user_auth']['username'], + "create_time"=>time(), + "verify_log"=>'' + ]; + $verifydata['partner_info'] = json_encode($partner_info,JSON_UNESCAPED_UNICODE); + + //判断是否存在 + $has = $this->where("partner_id = {$p_id}")->find(); + if($has){ + //存在 + $verifydata['id'] = $has['id']; + $res = $this->save($verifydata); + }else{ + $res = $this->add($verifydata); + } + return $res; + } + +} \ No newline at end of file diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html index 683e80e13..9a7e3cabe 100644 --- a/Application/Admin/View/Partner/export.html +++ b/Application/Admin/View/Partner/export.html @@ -73,7 +73,6 @@ 生效期限 开票税点 - 发票类型 发票类型 税费费率 @@ -131,6 +130,7 @@ {$data.invoice_type} {$data.taxation_rate}% + {$data.channel_rate}% {$data.reg_address} {$data.reg_phone} diff --git a/Application/Admin/View/Partner/index.html b/Application/Admin/View/Partner/index.html index d7e2a8b09..7792eef81 100644 --- a/Application/Admin/View/Partner/index.html +++ b/Application/Admin/View/Partner/index.html @@ -49,23 +49,32 @@
+ placeholder="创建开始时间"/> -
+ placeholder="创建结束时间"/>
+
+ +
+
搜索
@@ -82,22 +91,25 @@ 合同合作方名称 对应平台 + 审核类型 + 公司性质 合同期限 结算生效期限 渠道费率 开票税点 - 结算生效期限 - + 税费费率 帐户名 银行账号 收款银行 - 是否有预付款 + 创建记录 + 审核记录 + - 操作 + 操作 @@ -108,88 +120,40 @@ - {$data.partner} - {$data.matche_platform} - {$data.company_type} - - {$data['game'][0]['original_package_name']} - {$data['game'][0]['relation_game_name']} - {$data['game'][0]['game_type_name']} - - {$data['game'][0]['game_ratio'][0]['name']} - {$data['game'][0]['game_ratio'][0]['ratio']}% - - - - - - - - - - - - - - - - - - + {$data.partner_info.partner} + {$data.partner_info.matche_platform} + {$data.verify_type} + {$data.partner_info.company_type} + {$data.contract_time} + {$data.validity_time} - {$data.settlement_type} - {$data.payee_name} - {$data.bank_account} - {$data.opening_bank} - {$data.has_advance_charge} + {$data.partner_info.channel_rate}% + {$data.partner_info.invoice_rate}% + {$data.partner_info.taxation_rate}% - {$data.is_collection} + {$data.partner_info.payee_name} + {$data.partner_info.bank_account} + {$data.partner_info.opening_bank} - - 编辑 - 查看 - 删除 - - - - - - - {$game_ratio['name']} - {$game_ratio['ratio']}% - - - - - + {$data.create} - - - - {$game['original_package_name']} - {$game['relation_game_name']} - {$game['game_type_name']} - - {$game['game_ratio'][0]['name']} - {$game['game_ratio'][0]['ratio']}% - - - - - - - - - - - - - {$game_ratio['name']} - {$game_ratio['ratio']}% - - - - - + + +
+ {$data.verify} +
+ +
+ {$data.verify} +
- - - - - - - + + + 查看 + + + + diff --git a/Data/update.sql b/Data/update.sql index 1fa495b60..e1535ba86 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2095,18 +2095,18 @@ ADD COLUMN `change_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '推广员充 --CP审核 cz ALTER TABLE `tab_partner` -ADD COLUMN `taxation_rate` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '开票税点' AFTER `cooperation_status`; +ADD COLUMN `taxation_rate` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '税费费率' AFTER `cooperation_status`; CREATE TABLE `tab_partner_verify` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', `partner_id` int(11) NOT NULL COMMENT '0新增,其他修改', `partner_name` varchar(60) NOT NULL DEFAULT '' COMMENT '上游公司名称', - `partner_info` text NOT NULL COMMENT '公司信息', - `verify_status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '状态 -1拒绝 0未审核 1审核通过', + `partner_info` text COMMENT '公司信息', + `verify_status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态 -1拒绝 0未审核 1审核通过', `create_admin_id` int(11) NOT NULL DEFAULT '0' COMMENT '添加人ID', - `create_admin_account` int(11) NOT NULL DEFAULT '0' COMMENT '添加人账号', + `create_admin_account` varchar(60) COMMENT '添加人账号', `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间', - `verify_log` text NOT NULL COMMENT '审批相关信息json', + `verify_log` text COMMENT '审批相关信息json', PRIMARY KEY (`id`), KEY `partner_id` (`partner_id`) USING BTREE, KEY `partner_name` (`partner_name`) USING BTREE,