From 46a3028fc96f64a1964f50b031eedd607f1e944e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 15 Jan 2020 10:23:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/StatementMangementController.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 2f21630e9..504d22e38 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -48,7 +48,6 @@ class StatementMangementController extends ThinkController // var_dump($data);die(); foreach ($data as $key => $value) { $data[$key]['order'] = json_decode($value['second_party_info'],true)['order_type']; - var_dump($data[$key]['order']); } $sumData = M("statement","tab_") From 10f3f8609daf283e4bc14dec802047c37976b787 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 15 Jan 2020 10:35:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/SafeController.class.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 930fd5843..55daaae66 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -207,6 +207,11 @@ class SafeController extends BaseController{ $this->error("手机号码格式不合法"); return false; } + $telInfo = M('promote','tab_')->field('id')->where(['mobile_phone'=>$tel])->find(); + if(!empty($telInfo)) { + $this->error("手机号码已存在"); + return false; + } if(empty($id_card)) { $this->error("身份证号码不能为空"); return false; @@ -344,12 +349,6 @@ class SafeController extends BaseController{ $id = get_pid(); $rs = M("promote","tab_")->field('anothpic,ver_status,real_name,bank_card,mobile_phone,email,address,idcard')->where(['id'=>$id])->find(); $anothpic = $rs['anothpic']; - /* if(!empty($anothpic)) { - $idcarpicArr = explode(',', $anothpic); - foreach ($idcarpicArr as $key => $value) { - $promoteInfo['valuedata'][$key] = $value; - } - } */ $promoteInfo = ""; $address = json_decode($rs['address'],false)[1]; $realname = mb_strlen($rs['real_name'],'utf-8') == 2 ? mb_substr($rs['real_name'],0,1,'utf-8').'*':mb_substr($rs['real_name'],0,1,'utf-8').'**'; @@ -380,6 +379,11 @@ class SafeController extends BaseController{ $this->error("手机号码格式不合法"); return false; } + $telInfo = M('promote','tab_')->field('id')->where(['mobile_phone'=>$tel])->find(); + if(!empty($telInfo)) { + $this->error("手机号码已存在"); + return false; + } if(empty($address1)) { $this->error("地址不能为空"); From 323facd599fac055b4ba4e97bb56f451b645933b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 15 Jan 2020 10:37:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E6=B7=BB=E5=8A=A0=E6=97=B6=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 1a8e4f3d8..140630b6e 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -221,6 +221,10 @@ class PromoteController extends ThinkController if ($this->accountExist($account)) { $this->error('该账号已存在'); } + $res = M('promote', 'tab_')->where(['mobile_phone' => $mobile_phone])->field('id')->find(); + if ($res) { + $this->error('该手机号已存在'); + } $company_belong = $_REQUEST['company_belong'] ?? 0; $company_relation = $_REQUEST['company_relation'] ?? 0; $data = array( From 38c64f54303d3829f5c4ae7553c6cc815a36998b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 15 Jan 2020 14:14:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-?= =?UTF-8?q?=E3=80=8B=E6=8E=A8=E5=B9=BF=E5=91=98=E5=88=97=E8=A1=A8=E5=8F=AF?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=86=85=E5=A4=96=E5=9B=A2=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 3 +++ Application/Admin/Controller/PromoteController.class.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 911f4ec86..118624446 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -5884,6 +5884,9 @@ class ExportController extends Controller if (I('status')) { $map['tab_promote.status'] = I('status'); } + if (strlen(I('company_belong'))) { + $map['company_belong'] = I("company_belong"); + } //为数据权限添加 setPowerPromoteIds($map, 'tab_promote.id'); diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 140630b6e..70f8984c6 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -96,6 +96,9 @@ class PromoteController extends ThinkController if (I("promote_level")) { $map['level'] = I("promote_level"); } + if (strlen(I('company_belong'))) { + $map['company_belong'] = I("company_belong"); + } $this->m_title = '推广员列表'; $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find()); if (isset($_REQUEST['row'])) { From ccca9fb0bd4aef32cadcf49a6a9b3fb6ae10ec4e Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 15 Jan 2020 14:16:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-?= =?UTF-8?q?=E3=80=8B=E6=8E=A8=E5=B9=BF=E5=91=98=E5=88=97=E8=A1=A8=E5=8F=AF?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=86=85=E5=A4=96=E5=9B=A2=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Promote/lists.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index e03f60b9d..319ef2847 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -134,6 +134,14 @@ + +
+ +
+ From a643e88ffb0291e0b588952045787f46db78d021 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 15 Jan 2020 14:27:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 4ebe26755..09504f5c4 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1085,4 +1085,8 @@ UPDATE tab_spend SET selle_ratio = 0.00 where selle_ratio is null ALTER TABLE `tab_promote_game_ratio` ADD COLUMN `relation_game_id` int(11) NOT NULL DEFAULT 0 COMMENT '关联游戏id' AFTER `game_id`; ALTER TABLE `tab_promote_game_ratio_log` -ADD COLUMN `relation_game_id` int(11) NOT NULL DEFAULT 0 COMMENT '关联游戏id' AFTER `game_id`; \ No newline at end of file +ADD COLUMN `relation_game_id` int(11) NOT NULL DEFAULT 0 COMMENT '关联游戏id' AFTER `game_id`; + +ALTER TABLE `tab_spend` +MODIFY COLUMN `selle_status` int(11) NOT NULL DEFAULT 0 COMMENT '渠道结算 0未结算1 结算', +MODIFY COLUMN `selle_ratio` double(5, 2) DEFAULT 0.00 COMMENT '渠道分成比例'; \ No newline at end of file