diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 1361d41af..58d4d7bfc 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -942,6 +942,7 @@ class PromoteService {
'create_time' => time(),
'company_belong' => $params['company_belong'] ?? 0,
'company_relation' => $params['company_relation'] ?? 0,
+ 'group_remark' => $params['group_remark'] ?? '',
];
if ($parent) {
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index af6d64798..635d124f4 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -1088,6 +1088,7 @@ class PromoteController extends BaseController
if (!$result['status']) {
$this->ajaxReturn(['status' => 0, 'msg' => $result['message']]);
}
+
$status = $promoteService->addPromote($params, $parent);
if ($status) {
$this->ajaxReturn(['status' => 1, 'msg' => '添加成功']);
@@ -1217,7 +1218,10 @@ class PromoteController extends BaseController
return false;
}
}
-
+ if (empty($_REQUEST['real_name'])) {
+ $this->error('联系人姓名不能为空', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+ exit();
+ }
if (empty($_REQUEST['real_name'])) {
$this->error('联系人姓名不能为空', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
exit();
@@ -1239,6 +1243,20 @@ class PromoteController extends BaseController
$this->error('您输入的手机号码格式不合法', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
}
+ $groupRemark = $_REQUEST['group_remark'] ?? '';
+ $promote = M('promote', 'tab_')->field(['id', 'level'])->where(['id' => $_REQUEST['id']])->find();
+ if (!$promote) {
+ $this->error('该推广员不存在', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+ return false;
+ }
+ if ($promote['level'] == 2 && $groupRemark == '') {
+ $this->error('请输入部门名称', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+ return false;
+ }
+ if ($promote['level'] == 3 && $groupRemark == '') {
+ $this->error('请输入小组名称', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+ return false;
+ }
// if (empty($_REQUEST['email'])) {
// $this->error('电子邮箱不能为空', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
// return false;
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index aa5387634..95b6063f1 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -146,7 +146,7 @@ class QueryController extends BaseController
$promoteData = [];
if (!empty($promoteIdData)) {
$promoteIdData = array_unique($promoteIdData);
- $promoteData = M('promote', 'tab_')->where(array('id' => ['in',$promoteIdData]))->getField('id,account,real_name');
+ $promoteData = M('promote', 'tab_')->where(array('id' => ['in',$promoteIdData]))->getField('id,account,real_name,group_remark');
}
foreach ($data as &$list) {
switch ($list['level']) {
@@ -169,8 +169,10 @@ class QueryController extends BaseController
$chainArr = explode('/', $chain);
$list['p_p_pro_account'] = $promoteData[$chainArr[1]]['account'];
$list['p_p_pro_real_name'] = $promoteData[$chainArr[1]]['real_name'];
+ $list['p_p_pro_group_remark'] = $promoteData[$chainArr[1]]['group_remark'];
$list['p_pro_account'] = $promoteData[$list['parent_id']]['account'];
$list['p_pro_real_name'] = $promoteData[$list['parent_id']]['real_name'];
+ $list['p_pro_group_remark'] = $promoteData[$list['parent_id']]['group_remark'];
break;
}
$list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
diff --git a/Application/Home/View/default/Promote/addPromote.html b/Application/Home/View/default/Promote/addPromote.html
index b80c232fe..d3c259252 100644
--- a/Application/Home/View/default/Promote/addPromote.html
+++ b/Application/Home/View/default/Promote/addPromote.html
@@ -70,10 +70,27 @@
| 昵称： |
-
+
|
+
+
+ | *部门名称： |
+
+
+
+ |
+
+
+
+ | *小组名称： |
+
+
+
+ |
+
+
|
@@ -164,6 +181,14 @@
if($('#repassword').val()!==$('#password').val()){
return json_data = {'status':0,'msg':'子渠道密码和确认密码不一致'}
}
+ if ((promote_type == 0 || promote_type == 1) && $.trim($('#group_remark')) == '') {
+ if (promote_type == 0) {
+ return json_data = {'status':0,'msg':'请输入部门名称'}
+ }
+ if (promote_type == 1) {
+ return json_data = {'status':0,'msg':'请输入小组名称'}
+ }
+ }
var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
// if(!myreg.test($('#mobile_phone').val())){
// return json_data = {'status':0,'msg':'请输入正确的手机号'}
diff --git a/Application/Home/View/default/Promote/edit_chlid.html b/Application/Home/View/default/Promote/edit_chlid.html
index bd2ed231c..86e011431 100644
--- a/Application/Home/View/default/Promote/edit_chlid.html
+++ b/Application/Home/View/default/Promote/edit_chlid.html
@@ -62,6 +62,23 @@
|
+
+
+ | *部门名称： |
+
+
+
+ |
+
+
+
+ | *小组名称： |
+
+
+
+ |
+
+
|
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index cbc06ac26..476c2891e 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -213,8 +213,8 @@
| {$vo.sdk_version} |
{$vo.server_name} |
{$vo.game_player_name} |
- {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}) |
- {$vo.p_pro_account}({$vo.p_pro_real_name}) |
+ {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}/{$vo.p_p_pro_group_remark}) |
+ {$vo.p_pro_account}({$vo.p_pro_real_name}/{$vo.p_pro_group_remark}) |
{$vo.pro_account}({$vo.pro_real_name}) |
{$vo.pay_time} |
diff --git a/Data/update.sql b/Data/update.sql
index cf7f2f909..4e7e58aa5 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1101,3 +1101,6 @@ ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显
ALTER TABLE `tab_promote_belong`
ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显示充值数据 0否 1是';
+
+ALTER TABLE `tab_promote`
+ADD COLUMN `group_remark` varchar(50) NOT NULL default '' COMMENT '部门分组';