diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 0643ada76..80c5fa79d 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -29,10 +29,8 @@ class BehaviorLogController extends ThinkController $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; $map['game_id'] = $game_id; } - if (isset($params['server_name'])) { - $game_id = M('game', 'tab_')->where(['relation_game_name' => $params['game_name'],'sdk_version' => $params['sdk_version']])->getField('id'); - $server_id = M('server', 'tab_')->where(['server_name' => $params['server_name'], 'game_id' => $game_id])->getField('server_num'); - $map['server_id'] = $server_id; + if (isset($params['server_id'])) { + $map['server_id'] =$params['server_id']; } if (isset($params['game_player_name'])) { $map['game_player_name'] = $params['game_player_name']; diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index f4ab7e9c2..8eede5401 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1140,9 +1140,9 @@ class MemberController extends ThinkController $map['user_account'] = array('like', trim($_REQUEST['account']) . '%'); unset($_REQUEST['account']); } - if (isset($_REQUEST['server_name'])) { - $map['server_name'] = $_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if (isset($_REQUEST['server_id'])) { + $map['server_id'] = $_REQUEST['server_id']; + unset($_REQUEST['server_id']); } // $promoteRoot = getPowerPromoteIds(); diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 9c3ccbb5a..75258aa05 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -141,6 +141,7 @@ class PromoteController extends ThinkController //为数据权限添加 setPowerPromoteIds($map, 'id'); $list_data = D(self::model_name)->where($map)->order('id DESC')->page($p, $row)->select(); + $list_data = D(self::model_name)->parseListData($list_data); $oa_data = []; if (I('oa_associated', -1) == -1) { foreach ($list_data as $k => $v) { @@ -220,14 +221,29 @@ class PromoteController extends ThinkController if ($this->accountExist($account)) { $this->error('该账号已存在'); } - $data = array('account'=>$account,'password'=>$password,'second_pwd'=>$second_pwd,'real_name'=>$real_name, - 'email'=>$email,'mobile_phone'=>$mobile_phone,'bank_name'=>$bank_name,'bank_card'=>$bank_card, - 'admin_id'=>session('user_auth')['uid'],'status'=>$status,'ba_id'=>$ba_id, 'company_id' => $company_id); + $company_belong = $_REQUEST['company_belong']; + $company_relation = $_REQUEST['company_relation']; + $data = array( + 'account'=>$account, + 'password'=>$password, + 'second_pwd'=>$second_pwd, + 'real_name'=>$real_name, + 'email'=>$email, + 'mobile_phone'=>$mobile_phone, + 'bank_name'=>$bank_name, + 'bank_card'=>$bank_card, + 'admin_id'=>session('user_auth')['uid'], + 'status'=>$status, + 'ba_id'=>$ba_id, + 'company_id' => $company_id, + 'company_belong' => $company_belong, + 'company_relation' => $company_relation, + ); if (preg_match('/^[a-zA-Z0-9]{6,15}$/', $account)==false) { $this->error('账号只能是6-15位字母或数字'); } - if (empty($company_id)) { + if ($company_id < 0) { $this->error('请选择推广公司'); } $promoteService = new PromoteService(); @@ -277,12 +293,16 @@ class PromoteController extends ThinkController if (preg_match('/^[a-zA-Z0-9]{6,15}$/', I('post.account'))==false) { $this->error('账号只能是6-15位字母或数字'); } - $promote = M("promote", "tab_")->where(array("id" => $_POST['id']))->field('id, level')->find(); + $promote = M("promote", "tab_") + ->where(array("id" => $_POST['id'])) + ->field('id, level, company_belong, company_relation, company_id') + ->find(); $data['account'] = I('post.account'); if ($this->accountExist($data['account'], $_POST['id'])) { $this->error('该账号已存在'); } - if (empty(I('company_id')) && $promote['level'] ==1) { + $company_id = I('company_id'); + if ($company_id <0 && $promote['level'] ==1) { $this->error('请选择推广公司'); } empty(I('post.id')) ? : $data['id'] =I('post.id'); @@ -310,15 +330,33 @@ class PromoteController extends ThinkController $ba = new \Admin\Model\BusinessAffairsModel(); $ba->update_child($ba_id['ba_id'], $_REQUEST['ba_id'], $id); } - if (!empty(I('company_id')) && $promote['level'] ==1) { - $data['company_id'] = I('company_id'); + + if ($promote['level'] ==1) {//如果是会长才能修改的选项 + if (!is_null($company_id)) { + $data['company_id'] = $company_id;//推广公司 + } + + $data['company_belong'] = I('company_belong');//工会归属 + $data['company_relation'] = I('company_relation');//工会关系 } + $res = M("promote", "tab_")->where(array("id"=>$_POST['id']))->save($data); if ($res !== false) { - if (!empty(I('company_id')) && $promote['level'] ==1) {//修改会长底下推广员的推广公司 - M("promote", "tab_")->where("chain like '%/{$_POST['id']}/%'")->save([ - 'company_id' => I('company_id') - ]); + if ($promote['level'] == 1) {//修改会长底下推广员的推广公司 + $array = array(); + if ($promote['company_id'] != $company_id) { + $array['company_id'] = I('company_id'); + } + if ($promote['company_belong'] != I('company_belong')) { + $array['company_belong'] = I('company_belong'); + } + if ($promote['company_relation'] != I('company_relation')) { + $array['company_relation'] = I('company_relation'); + } + if ($array) { + $res = M("promote", "tab_")->where("chain like '%/{$_POST['id']}/%'")->save($array); + } + } $this->success("修改成功", U('lists')); } else { diff --git a/Application/Admin/Controller/ServerController.class.php b/Application/Admin/Controller/ServerController.class.php index 0af4e3057..15318d831 100644 --- a/Application/Admin/Controller/ServerController.class.php +++ b/Application/Admin/Controller/ServerController.class.php @@ -44,9 +44,9 @@ class ServerController extends ThinkController { unset($_REQUEST['game_name']); } } - if(isset($_REQUEST['server_name'])){ - $extend['server_name']=$_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if(isset($_REQUEST['server_id'])){ + $extend['server_id']=$_REQUEST['server_id']; + unset($_REQUEST['server_id']); } if(empty($_GET['type']) || $_GET['type'] == 1) { $extend['developers'] = array('EQ',0); diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index a90a2a13f..ce71bec6c 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -43,9 +43,9 @@ class SpendController extends ThinkController if (isset($_REQUEST['game_type']) && $_REQUEST['game_type']) { $map['sdk_version'] = $_REQUEST['game_type']; } - if (isset($_REQUEST['server_name'])) { - $map['server_name'] = $_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if (isset($_REQUEST['server_id'])) { + $map['server_id'] = $_REQUEST['server_id']; + unset($_REQUEST['server_id']); } if (isset($_REQUEST['pay_order_number'])) { $map['pay_order_number'] = array('like', trim($_REQUEST['pay_order_number'])); diff --git a/Application/Admin/Controller/SpendCountSetController.class.php b/Application/Admin/Controller/SpendCountSetController.class.php index 2ea622e92..16dd8f585 100644 --- a/Application/Admin/Controller/SpendCountSetController.class.php +++ b/Application/Admin/Controller/SpendCountSetController.class.php @@ -18,7 +18,8 @@ class SpendCountSetController extends \Think\Controller //初始化 $this->beginThismonth = mktime(0,0,0,date('m')-1,1,date('Y')); $this->endThismonth = mktime(0,0,0,date('m'),1,date('Y'))-1; - $this->date = date('Y')."-".((date('m')-1) > 9 ? (date('m')-1) : "0".(date('m')-1)); + $temp = strtotime(date('Y-m-01 00:00:00',strtotime('-1 month'))); + $this->date = date('Y',$temp)."-".date('m',$temp); $this->nowdata =time(); $this->model =M(); $this->usermodel =M("spend_user_count",'tab_'); diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index b466da9a2..2e9a02bd8 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -407,4 +407,16 @@ class PromoteModel extends Model{ return $result; } + + public function parseListData($result) + { + $parseData = array(); + foreach ($result as $key => $value) { + $parseData[$key] = $value; + $parseData[$key]['company_belong_str'] = $value['company_belong'] ? '外团' : '内团'; + } + return $parseData; + } + + } \ No newline at end of file diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index f2346001f..577f73f22 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -73,7 +73,7 @@
-
@@ -443,7 +443,7 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#sdk_version").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -453,11 +453,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index cd1327b1a..4c127dc38 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -83,7 +83,7 @@
-
@@ -281,7 +281,7 @@ }) }); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -291,11 +291,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); diff --git a/Application/Admin/View/Promote/add.html b/Application/Admin/View/Promote/add.html index d2a4326dd..ccc01973a 100644 --- a/Application/Admin/View/Promote/add.html +++ b/Application/Admin/View/Promote/add.html @@ -43,7 +43,8 @@ *所属推广公司 内团 + + + + + + + + + 工会关系： + + + + + + + + + 真实姓名： @@ -137,6 +169,15 @@ $(function(){ prov="{:substr($data['bank_area'],0,2)}"; city="{:substr($data['bank_area'],2,2)}"; ciarea="{:substr($data['bank_area'],4,2)}"; + $("input[name=company_belong]").click(function () { + if ($(this).val() == 1) { + $('#company_relation').show(); + } else { + $('#company_relation').hide(); + } + + }); + }); //得到地区码 function getAreaID(){ diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html index f7eb7fc90..6abc2b084 100644 --- a/Application/Admin/View/Promote/edit.html +++ b/Application/Admin/View/Promote/edit.html @@ -183,7 +183,8 @@ + checked="checked" + + name="company_belong" class="company_belong"> 内团 + + + + + + + + id="company_relation"> + 工会关系： + + + + + + + + + + + + 工会归属： + + + + + + + + + + id="company_relation"> + 工会关系： + + + + + + + + + + 注册时间： @@ -353,6 +430,15 @@ $(function(){ city="{:substr($data['bank_area'],2,2)}"; ciarea="{:substr($data['bank_area'],4,2)}"; //initComplexArea('seachprov', 'seachcity', 'seachdistrict', area_array, sub_array, prov, city, ciarea); + + $("input[name=company_belong]").click(function () { + if ($(this).val() == 1) { + $('#company_relation').show(); + } else { + $('#company_relation').hide(); + } + + }); }); // //得到地区码 // function getAreaID(){ diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 0aa7f9d25..c36ecc8df 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -184,6 +184,7 @@ 最后登录时间 渠道类型 所属会长 + 工会归属 商务专员 状态 身份状态 @@ -231,6 +232,7 @@ {:encryptStr(getTopPromote($data['id'])['account'])} + {$data['company_belong_str']} {:get_business_affairs_account($data['ba_id'])} diff --git a/Application/Admin/View/Server/lists.html b/Application/Admin/View/Server/lists.html index 8eaf145c6..4bb159751 100644 --- a/Application/Admin/View/Server/lists.html +++ b/Application/Admin/View/Server/lists.html @@ -86,7 +86,7 @@
-
@@ -333,7 +333,7 @@ $(function(){ }); $("#server_version").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_name").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -343,11 +343,11 @@ $(function(){ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 39ac2ed7b..6f0014198 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -76,7 +76,7 @@
-
@@ -568,7 +568,7 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -578,11 +578,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 06cf3c2f4..606dfed31 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -940,6 +940,8 @@ class PromoteService { 'company_id' => $params['company_id'] ?? 0, 'invite_code' => $params['invite_code'] ?? '', 'create_time' => time(), + 'company_belong' => $params['company_belong'] ?? 0, + 'company_relation' => $params['company_relation'] ?? 0, ]; if ($parent) {