add promote topic position

search/views/topic.py

@@ -75,7 +75,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         if b"data" in recommend_topic_dict:
             recommend_topic_id_list = json.loads(recommend_topic_dict[b"data"])
             cursor = int(str(recommend_topic_dict[b"cursor"], encoding="utf-8"))
-            newcursor = cursor + 5
+            newcursor = cursor + 6
             if len(recommend_topic_id_list) > newcursor:
                 recommend_topic_list = recommend_topic_id_list[cursor:newcursor]
                 redis_client.hset(topic_recommend_redis_key,"cursor",newcursor)
@@ -119,12 +119,28 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         promote_recommend_topic_id_list = TopicHomeRecommend.objects.using(settings.SLAVE_DB_NAME).filter(
             is_online=1).values_list("topic_id")
         have_read_topic_id_list.extend(promote_recommend_topic_id_list)
+        topic_id_list = list()
 
-        topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
+        rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
                                                            recommend_tag_list=recommend_topic_list,
                                                            user_similar_score_list=user_similar_score_redis_list,index_type="topic",routing="4,5",attention_tag_list=attention_tag_list)
+
+        if (len(recommend_topic_list) == 6):
+            if (size < 11):
+                topic_id_list.extend(rank_topic_id_list[0:3])
+                topic_id_list.extend(recommend_topic_id_list[0:3])
+                topic_id_list.extend(rank_topic_id_list[3:size])
+                topic_id_list.extend(recommend_topic_id_list[3:6])
+            else:
+                topic_id_list.extend(rank_topic_id_list[0:size - 7])
+                topic_id_list.extend(recommend_topic_id_list[0:3])
+                topic_id_list.extend(rank_topic_id_list[size - 7:size])
+                topic_id_list.extend(recommend_topic_id_list[3:6])
+        else:
+            topic_id_list.extend(rank_topic_id_list)
+
         have_read_group_id_set = set()
         have_read_user_id_set = set()
         unread_topic_id_dict = dict()
@@ -165,7 +181,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         #         else:
         #             break
 
-        topic_id_list.extend(recommend_topic_list)
+        # topic_id_list.extend(recommend_topic_list)
         # recommend_topic_list.extend(topic_id_list)
         have_read_topic_id_list.extend(topic_id_list)
         if len(have_read_topic_id_list) > 30000: