Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/marketing/DistributorService.php

@@ -69,6 +69,12 @@ class DistributorService
         $userName = !empty($params['user_name']) ? $params['user_name'] : '';
         $distributorType = 1; //一级团长
         $info = Distributor::getRecord(['user_id' => $userId,'distributor_type' => $distributorType]);
+        $shareUserId = !empty($params['share_user_id']) ? $params['share_user_id'] : '';
+
+        if (!empty($shareUserId)) {
+            $userId = $shareUserId;
+        }
+
         if (!empty($info)) {
             throw new DistributorException(['cus'=>2]);
         }
@@ -318,19 +324,19 @@ class DistributorService
         $param = [
             'user_id' => !empty($where['user_id']) ? $where['user_id'] : '',
         ];
-        $jwUser = new JwUser();
-        $userInfo =  $jwUser->getUserByUserId($params);
 
+        $jwUser = new JwUser();
+        $userInfo =  $jwUser->getUserByUserId($param);
         if (!empty($userInfo) && $userInfo['result'] ==0) {
             $user = $userInfo['data'];
         }
         $data['avatar'] = !empty($userInfo['data']['avatar']) ? $userInfo['data']['avatar'] : '';
         $data['nick_name'] = !empty($userInfo['data']['nickName']) ? $userInfo['data']['nickName'] : '';
         if (!empty($info)) {
-            $data['distributor_code'] = $info['distributor_code'];
+            $data['distributor_code'] = !empty($info['distributor_code']) ? $info['distributor_code'] : '';
             $data['is_distributor'] = 1;
         }else{
-            $data['distributor_code'] = $info['distributor_code'];
+            $data['distributor_code'] = !empty($info['distributor_code']) ? $info['distributor_code'] : '';
             $data['is_distributor'] = 0;
         }
         return $data ;