Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/cms-service into develop

app/Repositories/FloorRepository.php

@@ -52,20 +52,24 @@ class FloorRepository
 
     public function info()
     {
+        Log::debug('推荐内容楼层-开始请求');
         $userInfo = $this->getUserInfo();
         if(!$userInfo){
             return jsonError('获取用户信息失败');
         }
+        Log::debug('推荐内容楼层-用户信息'.json_encode($userInfo));
         $floor = $this->floor
             ->where('is_open', 1)
             ->whereIn('floor_type', [0,1,2,3])
             ->whereBetween('floor_location', [1,20])
             ->get();
+        Log::debug('推荐内容楼层-楼层列表'.json_encode($floor));
         $data = [];
         foreach($floor as $item){
             if($item->floor_type == 0){
                 //banner
                 $banner = $this->getBanner($item->group_ids);
+                Log::debug('推荐内容楼层-banner'.json_encode($banner));
                 if($banner){
                     $data[$item->floor_location] = [
                         'show_type' => 'banner',
@@ -75,14 +79,16 @@ class FloorRepository
             }elseif($item->floor_type == 1){
                 //user
                 $memberIds = $this->memberGroup
-                    ->join('member_group_info', 'member_group_info.member_group_id', '=', 'member_group.id')
+                    ->join('member_group_info', '.member_group_id', '=', 'member_group.id')
                     ->where('member_group.id', $item->group_ids)
+                    ->orderBy('member_group_info.sort', 'asc')
                     ->limit(20)
                     ->pluck('member_group_info.uid')
                     ->toArray();
                 if(!$memberIds) continue;
                 $memberIds = implode($memberIds, ',');
                 $member = $this->getMemberGroup($memberIds);
+                Log::debug('推荐内容楼层-user'.json_encode($member));
                 if(!$member) continue;
                 $data[$item->floor_location] = [
                     'show_type' => 'user',
@@ -93,12 +99,14 @@ class FloorRepository
                 $videoIds = $this->videoGroup
                     ->join('video_group_info', 'video_group_info.video_group_id', '=', 'video_group.id')
                     ->where('video_group.id', $item->group_ids)
+                    ->orderBy('video_group_info.sort', 'asc')
                     ->limit(20)
                     ->pluck('video_group_info.post_id')
                     ->toArray();
                 if(!$videoIds) continue;
                 $videoIds = implode($videoIds, ',');
                 $video = $this->getPostVideo($videoIds);
+                Log::debug('推荐内容楼层-video'.json_encode($video));
                 if(!$video) continue;
                 $data[$item->floor_location] = [
                     'show_type' => 'video',
@@ -115,6 +123,7 @@ class FloorRepository
                 if(!$topicIds) continue;
                 $topicIds = implode($topicIds, ',');
                 $topic = $this->getTopic($topicIds);
+                Log::debug('推荐内容楼层-topic'.json_encode($topic));
                 if(!$topic) continue;
                 $data[$item->floor_location] = [
                     'show_type' => 'topic',
@@ -122,7 +131,8 @@ class FloorRepository
                 ];
             }
         }
-        return $data;
+        Log::debug('推荐内容楼层-data'.json_encode($data));
+        return jsonSuccess($data);
     }
 
 }