From 3ac2ae9bf121672e1f2b848abad4f5efd11ac71a Mon Sep 17 00:00:00 2001 From: dengbw Date: Mon, 8 May 2023 09:57:43 +0800 Subject: [PATCH] market_groups_consultant --- .../controllers/api/sylive/GroupsCustomer.php | 6 ++++-- .../controllers/api/sylive/GroupsExchange.php | 14 +++++++++----- market/controllers/api/sylive/GroupsOrder.php | 18 +++++++++++------- market/controllers/api/sylive/GroupsWin.php | 14 +++++++++----- market/controllers/api/sylive/Live.php | 12 ++++++++---- market/controllers/api/sylive/Order.php | 8 +++++--- 6 files changed, 46 insertions(+), 26 deletions(-) diff --git a/market/controllers/api/sylive/GroupsCustomer.php b/market/controllers/api/sylive/GroupsCustomer.php index 0b7519c7..2d1197e0 100644 --- a/market/controllers/api/sylive/GroupsCustomer.php +++ b/market/controllers/api/sylive/GroupsCustomer.php @@ -311,8 +311,10 @@ class groupsCustomer extends BaseController $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']; + if($cfUserId){ + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + $re_user['uname'] && $consultant = $re_user['uname']; + } return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1, 'levelName2' => $levelName2, 'levelName3' => $levelName3]; } diff --git a/market/controllers/api/sylive/GroupsExchange.php b/market/controllers/api/sylive/GroupsExchange.php index c8b61e9a..2c20cec2 100644 --- a/market/controllers/api/sylive/GroupsExchange.php +++ b/market/controllers/api/sylive/GroupsExchange.php @@ -399,7 +399,7 @@ class groupsExchange extends BaseController $levelId3 = intval($params['levelId3']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); - if (!$bizId) { + if (!$bizId && $params['userId']) { $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'], 'kpi' => 'order']); if ($re) { $levelId1 = $re['levelId1']; @@ -409,8 +409,10 @@ class groupsExchange extends BaseController $cfUserId = $re['cfUserId']; } } - $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); - $res_org['groupsName'] && $stores = $res_org['groupsName']; + if ($bizId) { + $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']; @@ -423,8 +425,10 @@ class groupsExchange extends BaseController $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']; + if ($cfUserId) { + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + $re_user['uname'] && $consultant = $re_user['uname']; + } return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1, 'levelName2' => $levelName2, 'levelName3' => $levelName3]; } diff --git a/market/controllers/api/sylive/GroupsOrder.php b/market/controllers/api/sylive/GroupsOrder.php index 0233aa74..ad36ba1e 100644 --- a/market/controllers/api/sylive/GroupsOrder.php +++ b/market/controllers/api/sylive/GroupsOrder.php @@ -214,7 +214,7 @@ class groupsOrder extends BaseController $levelId3 = intval($params['levelId3']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); - if (!$bizId) { + if (!$bizId && $params['userId']) { $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'], 'kpi' => 'order']); if ($re) { $levelId1 = $re['levelId1']; @@ -224,8 +224,10 @@ class groupsOrder extends BaseController $cfUserId = $re['cfUserId']; } } - $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); - $res_org['groupsName'] && $stores = $res_org['groupsName']; + if ($bizId) { + $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']; @@ -238,10 +240,12 @@ class groupsOrder extends BaseController $res_org = $this->mdSyliveGroups->get(["groupsId" => $levelId3]); $res_org['groupsName'] && $levelName3 = $res_org['groupsName']; } - $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); - if ($re_user['uname']) { - $consultant = $re_user['uname']; - $consultantMobile = $re_user['mobile']; + if ($cfUserId) { + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + if ($re_user['uname']) { + $consultant = $re_user['uname']; + $consultantMobile = $re_user['mobile']; + } } return ['stores' => $stores, 'consultant' => $consultant, 'consultantMobile' => $consultantMobile, 'levelName1' => $levelName1, 'levelName2' => $levelName2, 'levelName3' => $levelName3]; diff --git a/market/controllers/api/sylive/GroupsWin.php b/market/controllers/api/sylive/GroupsWin.php index d8598775..2c997b61 100644 --- a/market/controllers/api/sylive/GroupsWin.php +++ b/market/controllers/api/sylive/GroupsWin.php @@ -217,7 +217,7 @@ class groupsWin extends BaseController $levelId3 = intval($params['levelId3']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); - if (!$bizId) { + if (!$bizId && $params['userId']) { $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'], 'kpi' => 'order']); if ($re) { $levelId1 = $re['levelId1']; @@ -227,8 +227,10 @@ class groupsWin extends BaseController $cfUserId = $re['cfUserId']; } } - $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); - $res_org['groupsName'] && $stores = $res_org['groupsName']; + if ($bizId) { + $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']; @@ -241,8 +243,10 @@ class groupsWin extends BaseController $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']; + if ($cfUserId) { + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + $re_user['uname'] && $consultant = $re_user['uname']; + } return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1, 'levelName2' => $levelName2, 'levelName3' => $levelName3]; } diff --git a/market/controllers/api/sylive/Live.php b/market/controllers/api/sylive/Live.php index fed4bf54..62c768a8 100644 --- a/market/controllers/api/sylive/Live.php +++ b/market/controllers/api/sylive/Live.php @@ -319,8 +319,10 @@ class Live extends BaseController $levelId3 = intval($params['levelId3']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); - $res_org = $this->mdSyliveGroups->get(["groupsId" => $bizId]); - $res_org['groupsName'] && $stores = $res_org['groupsName']; + if ($bizId) { + $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']; @@ -333,8 +335,10 @@ class Live extends BaseController $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']; + if ($cfUserId) { + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + $re_user['uname'] && $consultant = $re_user['uname']; + } return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1, 'levelName2' => $levelName2, 'levelName3' => $levelName3]; } diff --git a/market/controllers/api/sylive/Order.php b/market/controllers/api/sylive/Order.php index 020ca058..07143ba0 100644 --- a/market/controllers/api/sylive/Order.php +++ b/market/controllers/api/sylive/Order.php @@ -156,7 +156,7 @@ class Order extends BaseController $areaId = intval($params['areaId']); $bizId = intval($params['bizId']); $cfUserId = intval($params['cfUserId']); - if (!$bizId) { + if (!$bizId && $params['userId']) { $re = $this->mdSyliveActivityKpidata->get(['activityId' => $params['activityId'], 'userId' => $params['userId'] , 'type' => $params['cfrom'], 'kpi' => 'order']); if ($re) { @@ -176,8 +176,10 @@ class Order extends BaseController $res_orga['organizationName'] && $area = $res_orga['organizationName']; $res_orgb['organizationName'] && $stores = $res_orgb['organizationName']; } - $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); - $re_user['uname'] && $consultant = $re_user['uname']; + if ($cfUserId) { + $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]); + $re_user['uname'] && $consultant = $re_user['uname']; + } return ['area' => $area, 'stores' => $stores, 'consultant' => $consultant]; }