Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Noble.php

@@ -170,7 +170,7 @@ class Noble extends Api
             $res3 = $nldlModel->insertGetId($data);
 
             // 添加当前用户钻石流水记录
-            $res4 = $userjewellogModel->addUserJewelLog($this->auth->id, $return, "+", $userInfo["jewel"] - $money, "开通贵族：'" . $noblelevelInfo["name"] . "',赠送" . $money . "钻石！", 15);
+            $res4 = $userjewellogModel->addUserJewelLog($this->auth->id, $return, "+", $userInfo["jewel"] - $money, "开通贵族：'" . $noblelevelInfo["name"] . "',赠送" . $return . "钻石！", 15);
 
 
             if($res1 && $res2 && $res3 && $res4) {

application/api/controller/Usercenter.php

@@ -66,11 +66,13 @@ class UserCenter extends Common
         $where["user_id"] = $user_id;
         $userCount = $followModel->where($where)->value("follows"); //该用户关注了几个人
         $userInfo["follows_count"] = $userCount?$userCount:0;
+        $userInfo["follows"] = $userInfo["follows_count"];//前端字段使用不一致添加
         // 获取粉丝数
         $where = [];
         $where["user_id"] = $user_id;
         $fansCount = $fansModel->where($where)->value("fans"); //该用户的粉丝数
         $userInfo["fans_count"] = $fansCount?$fansCount:0;
+        $userInfo["fans"] = $userInfo["fans_count"];//前端字段使用不一致添加
         // 获取贵族信息
         $nobleInfo = $this->userModel->getUserNobleInfo($user_id);
         // 查看者是否已关注
@@ -1068,11 +1070,15 @@ class UserCenter extends Common
                 throw new Exception('参数错误');
             }
             $where['invite_no'] = $inviteNo;
-            $userField = 'id,invite_no';
+            $userField = 'id,invite_no,pre_userid';
             $user = model('User')->field($userField)->where($where)->find();
             if (empty($user)) {
                 throw new Exception('无效的邀请码');
             }
+            //判断邀请码用户不能是自己的下级
+            if ($user['pre_userid'] == $userId) {
+                throw new Exception('对方已被您邀请过');
+            }
             $userInviteWhere['invite_user_id'] = $userId;
             $userInvite = model('UserInvite')->where($userInviteWhere)->find();
             if (!empty($userInvite)) {
@@ -1131,7 +1137,9 @@ class UserCenter extends Common
             $lastWeekNum = $userInviteModel->where($userInviteWhere)->where($appendLastWhere)->count();
             //全部
             $totalNum = $userInviteModel->where($userInviteWhere)->count();
+            $inviteMoney = config('site.invite_money');
             $result = [
+                'invite_money' => (int)$inviteMoney,
                 'invite_no' => $inviteNo,//邀请码
                 'today_money' => $todayMoney,//今日收益
                 'total_money' => $totalMoney,//总收益

application/common/library/Auth.php

@@ -181,8 +181,8 @@ class Auth
             'mobile'    => $mobile,
             'level'     => 0,
             'score'     => 0,
-            'avatar'    => isset($extend["avatar"]) ? $extend["avatar"] : '/assets/dc0f37f043e1e9f5240ed87e37f18740.png',
-            'image'     => '/assets/9e41a766262bcbded449334a5cc0adfd.jpeg',
+            'avatar'    => isset($extend["avatar"]) ? $extend["avatar"] : cdnurl('/assets/img/default_avatar.png'),
+            'image'     => '/assets/img/default_avatar.png',
         ];
         //https://bansheng-1304213176.cos.ap-guangzhou.myqcloud.com/
         $params = array_merge($data, [