1

data_manage/public_analysis.py

@@ -417,17 +417,19 @@ def image_rank(start, end, type,book, page, page_size, order_by, order):
 
 
 """广告排行榜"""
-def advertisement_rank(start,end,type,page,page_size,order,order_by,book):
-
+def advertisement_rank(user_id,start,end,type,page,page_size,order,order_by,book,channel,pitcher):
+    op1 = f" and pitcher in {str(tuple([i['nick_name'] for i in get_pitcher({'user_id': user_id})] + [get_user_name_by_id(user_id)]))}"
     op2=f" and dt>='{start}' " if start else ''
     op3=f" and dt<='{end}' " if end else ''
+    op4 = f" and channel='{channel}'" if channel else ''
+    op5 = f" and pitcher ='{pitcher}' " if pitcher else ''
     op8=f" and type='{type}'" if type else ''
     op9=f" order by {order_by} {order}" if order_by and order else ''
     op10=f" and book='{book}'" if book else ''
     db =MysqlUtils().dm
 
     sql=f"""select 
-    dt,stage,platform,book,`type`, cost,
+    dt,stage,platform,book,`type`, cost,channel,pitcher,
     view_count,
     click_count,
     follow_count,
@@ -445,7 +447,7 @@ def advertisement_rank(start,end,type,page,page_size,order,order_by,book):
     image_id,
     preview_url
     from dw_image_cost_day
-    where preview_url!=''  {op2} {op3} {op8} {op10} {op9}  
+    where preview_url!='' {op1} {op2} {op3} {op4} {op5} {op8} {op10} {op9}  
     """
     sum_sql = f"""select '总计' as pitcher,
                       sum(cost) cost,

handlers/PublicAnalysisHandler.py

@@ -155,7 +155,7 @@ class ImageRank(BaseHandler):
 
 
 
-"""广告排行榜"""
+"""素材排行榜"""
 class AdvertisementRank(BaseHandler):
     def post(self):
         if not self._au:
@@ -163,6 +163,7 @@ class AdvertisementRank(BaseHandler):
         else:
             du = DateUtils()
             arg = self.get_args()
+            user_id = arg.get('user_id')
             start = arg.get("start",du.getNow())
             end = arg.get("end")
             page = arg.get("page",1)
@@ -171,5 +172,7 @@ class AdvertisementRank(BaseHandler):
             order = arg.get("order", 'desc')
             type =arg.get("type")
             book =arg.get("book")
-            data, total,total_data = advertisement_rank(start, end, type,page,page_size,order,order_by,book)
+            channel =arg.get('channel')
+            pitcher = arg.get('pitcher')
+            data, total,total_data = advertisement_rank(user_id,start, end, type,page,page_size,order,order_by,book,channel,pitcher)
             self.write_json(data=data, total=total,total_data=total_data)