新增字段到topic

search/views/group.py

@@ -237,6 +237,7 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
 def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
     """
     :remark 画报排序 人气 部分
+    人气按照票数从大到小排序，相同票数按照图片票数更新时间由旧到新排序
     :param user_id:
     :param sort_type:
     :param offset:
@@ -251,9 +252,24 @@ def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
             "query": {
                 "bool": {
                     "must": [
-                        {"term": {"pictorial_id": pictorial_id}},
                         {"term": {"is_online": True}},
                         {"term": {"is_deleted": False}},
+                        {
+                            "nested": {
+                                "path": "related_billboard",
+                                "query": {
+                                    "bool": {
+                                        "must": [
+                                            {
+                                                "term": {
+                                                    "pictorial_id": pictorial_id
+                                                }
+                                            }
+                                        ]
+                                    }
+                                }
+                            }
+                        }
                     ]
                 }
             },

trans2es/utils/topic_transfer.py

@@ -138,6 +138,9 @@ class TopicTransfer(object):
                 res["is_operation_home_recommend"] = True
 
             logging.info("test topic transfer time cost,time0:%d,time1:%d,time2:%d,time3:%d,time4:%d" % (time0,time1,time2,time3,time4))
+
+            #榜单关联的投票
+            res["related_billboard"] = instance.get_related_billboard()
             return res
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())