Merge branch 'java-api' of git.dev.yoho.cn:web/yohobuy into java-api

@@ -419,7 +419,7 @@ class HomeController extends AbstractAction
         //显示网站导航头部信息
         $this->setNavHeader('会员等级');
         $uid = $this->getUid();
-        $uid = '8826435'; //临时测试用
+        $uid = '3566171'; //临时测试用
         $data = GradeModel::getGrade($uid);
         $data['pageFooter'] = true;
         $this->_view->display('vip-grade', $data);

@@ -4,6 +4,7 @@ namespace Home;
 
 use Configs\CacheConfig;
 use LibModels\Wap\Home\GradeData;
+use LibModels\Wap\Home\UserData;
 use Plugin\Cache;
 use Plugin\Helpers;
 
@@ -57,8 +58,8 @@ class GradeModel
             //消费总计
             $result['vipGrade']['sumCost'] = $data['costInfo']['total'];
             //username 调用获取用户基本信息数据，获得username;
-            //$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);
-            $result['vipGrade']['name'] = '杨阳';
+            $userData = UserData::userData($uid);
+            $result['vipGrade']['name'] = $userData['username'];
             //跳转url(会员特权详情)
             $result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential', null);
             //当前vip等级享受的特权