From eb2058633d2e6296e607e3be6c60af3d83ff71fb Mon Sep 17 00:00:00 2001 From: dengbw Date: Fri, 9 Dec 2022 17:39:10 +0800 Subject: [PATCH] market_groups_1209_4 --- market/controllers/api/sylive/Groups.php | 2 +- market/controllers/api/sylive/GroupsOrder.php | 75 +++++++++---------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/market/controllers/api/sylive/Groups.php b/market/controllers/api/sylive/Groups.php index 477a8059..128ab671 100644 --- a/market/controllers/api/sylive/Groups.php +++ b/market/controllers/api/sylive/Groups.php @@ -146,7 +146,7 @@ class Groups extends BaseController $re_gro = $this->mdSyliveGroups->get(['groupsId' => $groupsId]); $activityId = intval($re_gro['activityId']); if ($re_gro && $re_gro['parentId'] != $parentId) { - $re_user = $this->mdSyliveGroupsUser->get(['groupsId' => $groupsId, 'activityId' => $activityId]); + $re_user = $this->mdSyliveGroupsUser->get(['groupsId' => $groupsId, 'status>=' => 0, 'activityId' => $activityId]); if ($re_user) { $this->return_json('此分组已有用户，不能修改上级分组'); } diff --git a/market/controllers/api/sylive/GroupsOrder.php b/market/controllers/api/sylive/GroupsOrder.php index 4efd1af4..08b11ffb 100644 --- a/market/controllers/api/sylive/GroupsOrder.php +++ b/market/controllers/api/sylive/GroupsOrder.php @@ -15,9 +15,11 @@ class groupsOrder extends BaseController parent::__construct(); $this->load->model('market/Market_sylive_order_model', 'mdSyliveOrder'); $this->load->model('market/Market_sylive_user_model', 'mdSyliveUser'); + $this->load->model('market/Market_sylive_activity_kpidata_model', 'mdSyliveActivityKpidata'); + $this->load->model('market/Market_sylive_groups_model', 'mdSyliveGroups'); + $this->load->model('market/Market_sylive_organization_model', 'mdSyliveOrganization'); $this->load->model('market/Market_sylive_team_model', 'mdSyliveTeam'); - $this->load->model('market/Market_sylive_activity_kpidata_model', 'mdSyliveActivityKpidata'); } /** @@ -52,12 +54,10 @@ class groupsOrder extends BaseController $uname = $params['uname']; $mobile = $params['mobile']; $status = $params['status']; - $cfrom = $params['cfrom']; $type = $params['type']; $sort = $params['sort']; $order = $params['order']; $bizId = $params['bizId']; - $teamId = $params['teamId']; $itemId = $params['itemId']; !$page && $page = 1; !$limit && $limit = 10; @@ -82,25 +82,15 @@ class groupsOrder extends BaseController $itemId && $where['itemId'] = $itemId; $uname && $where['uname LIKE "%' . trim($uname) . '%"'] = null; $mobile && $where['mobile LIKE "%' . trim($mobile) . '%"'] = null; - strlen($cfrom) && $where['cfrom'] = $cfrom; strlen($type) && $where['type'] = $type; - $cfrom == 1 && $bizId = 0; if ($bizId) { - $res_org = $this->mdSyliveOrganization->get(["organizationId" => $bizId]); + $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); if ($res_org) { - if ($res_org['organizationType'] == 3) {//门店 + if ($res_org['groupsLevel']) { + $levelId = 'levelId' . $res_org['groupsLevel']; + $where[$levelId] = $bizId; + } else if ($res_org['parentId']) {//门店 $where['bizId'] = $bizId; - } else if ($res_org['organizationType'] == 2) {//大区 - $where['areaId'] = $bizId; - } - } - } elseif ($teamId) { - $res_team = $this->mdSyliveTeam->get(["teamId" => $bizId]); - if ($res_team) { - if ($res_team['teamType'] == 2) {//团队 - $where['bizId'] = $bizId; - } else if ($res_team['teamType'] == 1) {//总部 - $where['areaId'] = $bizId; } } } @@ -113,13 +103,15 @@ class groupsOrder extends BaseController $res = $this->mdSyliveOrder->select($where, $sort_order, $page, $limit); foreach ($res as $v) { $consultant = $this->consultantGet(['activityId' => $v['activityId'], 'userId' => $v['userId'] - , 'areaId' => $v['areaId'], 'bizId' => $v['bizId'], 'cfrom' => $v['cfrom'], 'cfUserId' => $v['cfUserId']]); + , 'levelId1' => $v['levelId1'], 'levelId2' => $v['levelId2'], 'levelId3' => $v['levelId3'] + , 'bizId' => $v['bizId'], 'cfUserId' => $v['cfUserId']]); $item = [ 'id' => $v['id'], 'sid' => $v['sid'], 'uname' => $v['uname'], 'mobile' => $v['mobile'], 'itemTitle' => $v['itemTitle'] , 'totalPrice' => $v['totalPrice'], 'payTime' => $v['payTime'] != '0000-00-00 00:00:00' ? $v['payTime'] : '' - , 'typeName' => $this->mdSyliveOrder->typeAry($v['type']) - , 'statusName' => $this->mdSyliveOrder->statusAry($v['status']), 'cfromName' => $this->mdSyliveOrder->cfromAry($v['cfrom']) - , 'createTime' => $v['createTime'], 'area' => $consultant['area'], 'stores' => $consultant['stores'], 'consultant' => $consultant['consultant'] + , 'typeName' => $this->mdSyliveOrder->typeAry($v['type']), 'createTime' => $v['createTime'] + , 'statusName' => $this->mdSyliveOrder->statusAry($v['status']) + , 'levelName1' => $consultant['levelName1'] , 'levelName2' => $consultant['levelName2'] , 'levelName3' => $consultant['levelName3'] + , 'stores' => $consultant['stores'], 'consultant' => $consultant['consultant'] ]; if ($limit == 10000) { $address = $biz = ''; @@ -152,33 +144,40 @@ class groupsOrder extends BaseController */ private function consultantGet($params) { - $area = $stores = $consultant = ''; - $areaId = intval($params['areaId']); + $stores = $consultant = $levelName1 = $levelName2 = $levelName3 = ''; + $levelId1 = intval($params['levelId1']); + $levelId2 = intval($params['levelId2']); + $levelId3 = intval($params['levelId3']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); if (!$bizId) { - $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'] - , 'type' => $params['cfrom'], 'kpi' => 'order']); + $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'], 'kpi' => 'order']); if ($re) { - $areaId = $re['areaId']; + $levelId1 = $re['levelId1']; + $levelId2 = $re['levelId2']; + $levelId3 = $re['levelId3']; $bizId = $re['bizId']; $cfUserId = $re['cfUserId']; } } - if ($params['cfrom'] == 1) { - $res_teama = $this->mdSyliveTeam->get(["teamId" => $areaId]); - $res_teamb = $this->mdSyliveTeam->get(["teamId" => $bizId]); - $res_teama['teamName'] && $area = $res_teama['teamName']; - $res_teamb['teamName'] && $stores = $res_teamb['teamName']; - } else { - $res_orga = $this->mdSyliveOrganization->get(["organizationId" => $areaId]); - $res_orgb = $this->mdSyliveOrganization->get(["organizationId" => $bizId]); - $res_orga['organizationName'] && $area = $res_orga['organizationName']; - $res_orgb['organizationName'] && $stores = $res_orgb['organizationName']; + $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); + $res_org['groupsName'] && $stores = $res_org['groupsName']; + if ($levelId1) { + $res_org = $this->mdSyliveGroups->get(["groupsId" => $levelId1]); + $res_org['groupsName'] && $levelName1 = $res_org['groupsName']; + } + if ($levelId2) { + $res_org = $this->mdSyliveGroups->get(["groupsId" => $levelId2]); + $res_org['groupsName'] && $levelName2 = $res_org['groupsName']; + } + if ($levelId3) { + $res_org = $this->mdSyliveGroups->get(["groupsId" => $levelId3]); + $res_org['groupsName'] && $levelName3 = $res_org['groupsName']; } $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); $re_user['uname'] && $consultant = $re_user['uname']; - return ['area' => $area, 'stores' => $stores, 'consultant' => $consultant]; + return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1, + 'levelName2' => $levelName2, 'levelName3' => $levelName3]; } } \ No newline at end of file