add

search/views/group.py

@@ -553,13 +553,48 @@ def pictorial_topic_sort_peoplehot(pictorial_id=-1, user_id=-1, offset=0, size=1
 
 
 @bind("physical/search/pictorial_activity_sort")
-def get_pictorial_activeity_sort(activity_id=0, pictorial_id=0):
+def get_pictorial_activeity_sort(activity_id=-1, pictorial_id=-1):
     try:
         pictorial_activity_sort_only = []
+        """
+        判断在不在活动中
+        """
+        q = {
+            "query": {
+                "bool": {
+                    "must": [
+                        {
+                            "term": {
+                                "activity_join": activity_id
+                            }
+                        },
+                        {
+                            "term": {
+                                "id": pictorial_id
+                            }
+                        },
+                        {
+                            "term": {
+                                "is_cover": True
+                            }
+                        },
+                        {
+                            "term": {
+                                "is_online": True
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+
+        result_dict = ESPerform.get_search_results(ESPerform.get_cli(), "pictorial", q, 0, 1)
+        if len(result_dict["hits"]) == 0:
+            pictorial_activity_sort_only.append({"pictorial_id": pictorial_id, "pictorial_sort": 0})
+            return {"pictorial_activity_sort": pictorial_activity_sort_only}
+
         pictorial_ids_list = pictorial_activity_sort(activity_id=activity_id, size=999, offset=0, sort_type=1)
-        logging.info("get pictorial_ids_list:%s" % pictorial_ids_list)
         data = pictorial_ids_list.get("pictorial_activity_sort", [])
-        logging.info("get data:%s" % data)
         if data:
             pictorial_ids = []
             for item in data:
@@ -574,4 +609,4 @@ def get_pictorial_activeity_sort(activity_id=0, pictorial_id=0):
 
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-        return {"pictorial_activity_sort": []}
+        return {"pictorial_activity_sort": []}
\ No newline at end of file