1

data_manage/pitcher_panel.py

@@ -108,7 +108,7 @@ where 1=1 {op1}
     return db.dm.getData_json(sql)
 
 
-def get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order):
+def get_channel_overview(channel,pitcher,stage,start,end,page,page_size,order_by,order):
     db=MysqlUtils()
     if pitcher:
         op1 = f" and pitcher='{pitcher}'" if get_channels_from_user(
@@ -119,6 +119,8 @@ def get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order
     op3 = f" and dt>='{start}' " if start else ''
     op4 = f" and dt<='{end}' " if end else ''
     op5 = f" order by {order_by} {order}" if order_by and order else ''
+    op6=f" and stage='{stage}'" if stage else ''
+
     sql=f"""select channel,dt date,
        view_count,click_count,
        round(if(view_count=0,0,click_count/view_count),4) click_rate,
@@ -148,7 +150,7 @@ def get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order
         round(reg_order_amount/reg_order_user,2) user_per_amount, 
         round(follow_user/click_count,4) click_follow_rate, 
         round(reg_order_user/follow_user,4) follow_order_rate 
-from dw_channel where 1=1 {op1} {op2} {op3} {op4} {op5} """
+from dw_channel where 1=1 {op1} {op2} {op3} {op4} {op6} {op5} """
 
     print(sql)
     sumsql=f"""select '总计' date,

data_manage/public_analysis.py

@@ -15,7 +15,7 @@ def book_rank(start,end,book,stage,page,page_size,order_by,order):
 
     sql=f"""select 
 concat(DATE_FORMAT(min(dt),'%Y/%m/%d') ,'~',DATE_FORMAT(max(dt),'%Y/%m/%d')) date,
-pitcher,book,
+pitcher,book,,stage,
 sum(cost) cost,
 sum(view_count) view_count,
 sum(click_count) click_count,

handlers/PitcherPanelHandler.py

@@ -59,6 +59,7 @@ class ChannelOverview(BaseHandler):
         pitcher=args.get("pitcher")
         start=args.get("start")
         end=args.get("end")
+        stage=args.get('stage')
         page = args.get("page", 1)
         page_size = args.get("page_size", 10)
         order_by = args.get("order_by", 'date')
@@ -66,7 +67,7 @@ class ChannelOverview(BaseHandler):
         if 'date_range' in list(args.keys()):
             end = self.get_n_days(0)
             start = self.get_n_days(-int(args['date_range'])+1)
-        data,total,total_data =get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order)
+        data,total,total_data =get_channel_overview(channel,pitcher,stage,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total,total_data=total_data)