Merge branch 'gyz' into 'master'

针对like 首页feed和榜单tab页，榜单封面策略优化

See merge request !474

libs/es.py

@@ -459,6 +459,7 @@ class ESPerform(object):
                                     {"term": {"is_online": True}},
                                     {"term": {"is_deleted": False}},
                                     {"terms": {"edit_tag_id": tag_id}},
+                                    {"term": {"is_cover": True}},
                                     {"term": {"is_recommend": True}}
                                 ]
                             }

search/utils/group.py

@@ -89,6 +89,7 @@ class GroupUtils(object):
                                 "filter": [
                                     {"term": {"is_online": True}},
                                     {"term": {"is_deleted": False}},
+                                    {"term": {"is_cover": True}},
                                     {"term": {"effective": True}}
                                 ],
                                 "must_not": [
@@ -151,6 +152,7 @@ class GroupUtils(object):
                         {"term": {"is_online": True}},
                         {"term": {"user_id": user_id}},
                         {"term": {"is_deleted": False}},
+                        {"term": {"is_cover": True}},
                         {"term": {"effective": True}}
                     ]
                 }
@@ -183,10 +185,7 @@ class GroupUtils(object):
             q = dict()
             q["size"] = 0
             q["query"] = {
-                "terms": {
-                    "pictorial_id": pictorial_ids_list
-                }
-            }
+                "bool": {"must": [{"term": {"is_cover": True}}, {"terms": {"pictorial_id": pictorial_ids_list}}]}}
             q["aggs"] = {
                 "pictorial_ids": {
                     "terms": {