From c20d507df6e956f5d1be44611d940746fc8e242c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 3 Jan 2020 17:29:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MendController.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 1e16b048c..034ad96ed 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -173,8 +173,7 @@ class MendController extends ThinkController { "pay_status"=>1, "user_account"=>$account, "pay_time"=>array("EGT",$order_time), - "selle_status"=>1, - "settle_check"=>1 + "selle_status"=>1 ); $flag = M("Spend","tab_")->where($map)->count(); if($flag > 0) return true; From fa3adf2e0b1c692f7d27c79d99edcf52fc1f3b3a Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 3 Jan 2020 18:24:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E6=96=B9=E6=97=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=20=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=EF=BC=8C?= =?UTF-8?q?=E9=82=AE=E5=AF=84=E5=9C=B0=E5=9D=80=E3=80=82=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=EF=BC=8C=E6=94=B6=E6=AC=BE=E6=96=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=20=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E6=88=B7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 34 +++++++++++- Application/Admin/View/Partner/add.html | 51 +++++++++++++++++ Application/Admin/View/Partner/edit.html | 55 ++++++++++++++++++- Data/update.sql | 8 +++ 4 files changed, 143 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 99b0b5fc3..c1d4986d2 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -92,10 +92,22 @@ class PartnerController extends ThinkController if ($res) { $this->error('合作方已存在'); } + if(!preg_match("/^1[358][0-9]{9}$/u",I('link_phone'))) { + $this->error('联系电话格式不正确'); + } $time = time(); $save['partner'] = $partner; $save['status'] = $status; + + $save['link_man'] = I('link_man'); + $save['link_phone'] = I('link_phone'); + $save['address'] = I('address'); + $save['company_tax_no'] = I('company_tax_no'); + $save['payee_name'] = I('payee_name'); + $save['bank_account'] = I('bank_account'); + $save['opening_bank'] = I('opening_bank'); + $save['uid'] = UID; $save['create_time'] = $time; $save['last_up_time'] = $time; @@ -131,7 +143,9 @@ class PartnerController extends ThinkController $this->error('参数异常'); } - $data = $model->field('id,partner')->find($id); + $data = $model + ->field('id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank') + ->find($id); if (empty($data)) { $this->error('数据异常'); } @@ -142,12 +156,24 @@ class PartnerController extends ThinkController $this->error('合作方已存在'); } + if(!preg_match("/^1[358][0-9]{9}$/u",I('link_phone'))) { + $this->error('联系电话格式不正确'); + } + $time = time(); $save['id'] = $id; $save['partner'] = $partner; + + $save['link_man'] = I('link_man'); + $save['link_phone'] = I('link_phone'); + $save['address'] = I('address'); + $save['company_tax_no'] = I('company_tax_no'); + $save['payee_name'] = I('payee_name'); + $save['bank_account'] = I('bank_account'); + $save['opening_bank'] = I('opening_bank'); + $save['status'] = $status; $save['last_up_time'] = $time; - $res = $model->save($save); if ($res === false) { $this->error('保存失败'); @@ -158,7 +184,9 @@ class PartnerController extends ThinkController } else { $id = intval(I('get.id', 0)); $map['id'] = $id; - $data = $model->field('id,partner,status')->find($id); + $data = $model + ->field('id,partner,status,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank') + ->find($id); if (empty($data)) { $this->error('数据异常', U('lists')); } diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index c499967a0..d4efaf0cd 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -35,6 +35,57 @@ + + + 联系人： + + + + + + + 联系电话： + + + + + + + 邮寄地址： + + + + + + + 公司税号： + + + + + + + 收款方名称： + + + + + + + 银行账号： + + + + + + + + 开户行： + + + + + *显示状态： diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index 8bfa4e180..902c9b0dd 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -35,17 +35,68 @@ + + + 联系人： + + + + + + + 联系电话： + + + + + + + 邮寄地址： + + + + + + + 公司税号： + + + + + + + 收款方名称： + + + + + + + 银行账号： + + + + + + + + 开户行： + + + + + *显示状态： diff --git a/Data/update.sql b/Data/update.sql index bf9d0accc..8f0ce3a30 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -919,4 +919,12 @@ ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zf ALTER TABLE tab_promote add `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属：0-内团；1-外团'; ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会关系：0-自主开发及维护；1-只维护'; +--游戏的合作方新增联系人，联系电话，邮寄地址,公司税号，收款方名称，银行账号，开户行 liuweiwen 2020-01-03 +ALTER TABLE tab_partner ADD `link_man` varchar(64) DEFAULT '' COMMENT '联系人' AFTER `status`; +ALTER TABLE tab_partner ADD `link_phone` varchar(24) DEFAULT NULL COMMENT '联系电话' AFTER `link_man`; +ALTER TABLE tab_partner ADD `address` varchar(255) DEFAULT NULL COMMENT '邮寄地址' AFTER `link_phone`; +ALTER TABLE tab_partner ADD `company_tax_no` varchar(64) DEFAULT NULL COMMENT '公司税号' AFTER `address`; +ALTER TABLE tab_partner ADD `payee_name` varchar(24) DEFAULT NULL COMMENT '收款方名称' AFTER `company_tax_no`; +ALTER TABLE tab_partner ADD `bank_account` varchar(32) DEFAULT NULL COMMENT '银行账号' AFTER `payee_name`; +ALTER TABLE tab_partner ADD `opening_bank` varchar(128) DEFAULT NULL COMMENT '开户行' AFTER `bank_account`; From 4892db340e5fb6a1a93f5a2981adccbbed92b25c Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 6 Jan 2020 14:24:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-?= =?UTF-8?q?=E3=80=8B=E6=B8=B8=E6=88=8F-=E3=80=8B=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E6=96=B9=E7=AE=A1=E7=90=86-=E3=80=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=EF=BC=8C=E9=82=AE?= =?UTF-8?q?=E5=AF=84=E5=9C=B0=E5=9D=80=E3=80=82=E5=85=AC=E5=8F=B8=E7=A8=8E?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=94=B6=E6=AC=BE=E6=96=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=BC=80?= =?UTF-8?q?=E6=88=B7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 7 ++++--- Application/Admin/View/Partner/lists.html | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index c1d4986d2..9c677d708 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -37,9 +37,10 @@ class PartnerController extends ThinkController $row = intval(I('row', 0)); $row = empty($row) ? 10 : $row;//每页条数 - $data = $model - ->field('tab_partner.id,tab_partner.partner,tab_partner.status,tab_partner.create_time,sys_member.nickname') - ->join('left join sys_member on sys_member.uid = tab_partner.uid') + $data = $model->alias('p') + ->field('p.id,p.partner,p.status,p.create_time,link_man,link_phone,address,company_tax_no,payee_name, + bank_account,opening_bank,m.nickname') + ->join('left join sys_member as m on m.uid = p.uid') ->where($map) ->order('id desc') ->page($page, $row) diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index 223a2403e..87d478aba 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -73,6 +73,15 @@ 合作方 显示状态 + + 联系人 + 联系电话 + 邮寄地址 + 公司税号 + 收款方名称 + 银行账号 + 开户行 + 添加人 添加时间 操作 @@ -89,6 +98,15 @@ {$data.partner} {$data.status} + + {$data.link_man} + {$data.link_phone} + {$data.address} + {$data.company_tax_no} + {$data.payee_name} + {$data.bank_account} + {$data.opening_bank} + {$data.nickname} {$data.create_time}