ck 4 gadi atpakaļ
vecāks
revīzija
4838c1e7ae
2 mainītis faili ar 14 papildinājumiem un 16 dzēšanām
  1. 6 9
      data_manage/pitcher_panel.py
  2. 8 7
      handlers/PitcherPanelHandler.py

+ 6 - 9
data_manage/pitcher_panel.py

@@ -26,6 +26,9 @@ def get_channels_from_user(user):
 
 
 def get_pitcher_panel_channel(pitcher,channel,start,end,page,page_size,order_by,order):
 def get_pitcher_panel_channel(pitcher,channel,start,end,page,page_size,order_by,order):
     db=MysqlUtils()
     db=MysqlUtils()
+    op1=f" and pitcher='{pitcher}'" if pitcher else ''
+    op2=f" and channel='{channel}'" if channel else ''
+
     sql=f"""select channel,stage,platform,book,
     sql=f"""select channel,stage,platform,book,
            dt as date,cost,first_order_amount,
            dt as date,cost,first_order_amount,
            if(cost=0,0,first_order_amount/cost) first_roi,
            if(cost=0,0,first_order_amount/cost) first_roi,
@@ -36,15 +39,9 @@ def get_pitcher_panel_channel(pitcher,channel,start,end,page,page_size,order_by,
            if(follow_user=0,0,cost/follow_user) follow_per_cost,
            if(follow_user=0,0,cost/follow_user) follow_per_cost,
            total_cost,
            total_cost,
            if(total_cost=0,0,total_amount/total_cost) back_rate
            if(total_cost=0,0,total_amount/total_cost) back_rate
-           from dw_channel_daily where dt>='{start}' and dt<='{end}'  """
-    if pitcher!='all':
-        sql += f" and pitcher='{pitcher}' "
-
-    if channel!='':
-        sql += f" and channel='{channel}' "
-
-    sql += f" order by {order_by} {order}"
-
+           from dw_channel_daily where dt>='{start}' and dt<='{end}' {op1} {op2} 
+           order by {order_by} {order}
+"""
     return getLimitData(db.quchen_text,sql,page,page_size)
     return getLimitData(db.quchen_text,sql,page,page_size)
 
 
 
 

+ 8 - 7
handlers/PitcherPanelHandler.py

@@ -8,15 +8,16 @@ class PitcherPanelChannel(BaseHandler):
     def post(self):
     def post(self):
         args = self.get_args()
         args = self.get_args()
         print(args)
         print(args)
-        pitcher = args.get("pitcher", '')
-        channel = args.get("channel", '')
-        start = args.get("start", self.get_n_days(-1))
+        pitcher = args.get("pitcher")
+        channel = args.get("channel")
+        start = args.get("start", self.get_n_days(0))
         end = args.get("end", self.get_n_days(0))
         end = args.get("end", self.get_n_days(0))
-        page = args.get("page",1)
-        page_size = args.get("page_size",10)
-        order_by=args.get("order_by",'date')
+        page = args.get("page")
+        page_size = args.get("page_size")
+        order_by=args.get("order_by",'cost')
         order=args.get("order", 'desc')
         order=args.get("order", 'desc')
-        if 'date_range' in list(args.keys()):
+        data_range=args.get('date_range')
+        if data_range:
             end = self.get_n_days(0)
             end = self.get_n_days(0)
             start = self.get_n_days(-int(args['date_range']))
             start = self.get_n_days(-int(args['date_range']))
         data,total=get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)
         data,total=get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)