1

data_manage/pitcher_panel.py

@@ -43,17 +43,18 @@ def get_pitcher_panel_channel(pitcher,channel,start,end,page,page_size,order_by,
 def get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, order):
     sql=f"""
         select formatDateTime(dt,'%Y-%m-%d') date ,pitcher,
-               toDecimal32(sum(cost),2) cost,
-               toDecimal32(sum(first_order_amount),2) first_order_amount,
-               toDecimal32(if(cost=0,0,first_order_amount/cost),4) first_roi ,
-               toDecimal32(sum(order_amount),2) order_amount,
-               toDecimal32(if(cost=0,0,sum(reg_order_amount)/cost),4)  today_roi,
-               toDecimal32(sum(total_cost),2) total_cost,
-               toDecimal32(sum(total_amount),2) total_amount,
-               toDecimal32(total_amount-total_cost,2) total_profit,
-               toDecimal32(if(total_cost=0,0,total_amount/total_cost),4) total_roi
+               round(sum(cost),2) cost,
+               round(sum(first_order_amount),2) first_order_amount,
+               round(if(cost=0,0,first_order_amount/cost),4) first_roi ,
+               round(sum(order_amount),2) order_amount,
+               round(if(cost=0,0,sum(reg_order_amount)/cost),4)  today_roi,
+               round(sum(total_cost),2) total_cost,
+               round(sum(total_amount),2) total_amount,
+               round(total_amount-total_cost,2) total_profit,
+               round(if(total_cost=0,0,total_amount/total_cost),4) total_roi
                from dw_daily_channel  where dt>='{start}' and dt<='{end}' """
 
+
     if pitcher != 'all':
         sql += f" and pitcher='{pitcher}' "
 
@@ -94,7 +95,8 @@ def get_pitcher_panel_overview(pitcher):
     return get_dict_list(key,data)
 
 
-def get_channel_overview(channel,start,end,page,page_size,order_by,order):
+def get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order):
+
     sql="""select channel,toString(dt) date,
        view_count,click_count,
        round(if(view_count=0,0,click_count/view_count),4) click_rate,
@@ -125,11 +127,17 @@ def get_channel_overview(channel,start,end,page,page_size,order_by,order):
         sql+=f" and start>='{start}'"
     if end!='':
         sql+=f" and end<='{end}'"
+    if pitcher!='':
+        sql+=f" and pitcher='{pitcher}'"
 
     sql += f" order by {order_by} {order} limit {page},{page_size} "
     print(sql)
 
-    return ck.execute(sql)
+    key=['channel','date','view_count','click_count','click_rate','follow_user','follow_rate','follow_per_cost','order_rate','order_per_cost','cost',
+         'first_order_count','first_order_user','first_order_amount','order_count','order_user','order_amount','old_order_amount','first_amount_per_user',
+         'new_user_order_rate','reg_user_amount','total_cost','total_amount','day_roi','all_roi','avg_new_order_rate','old_user_once_order_rate']
+
+    return get_dict_list(key,get_round(ck.execute(sql)))
 
 
 def get_channel_again_order_trend(channel,date):
@@ -143,12 +151,14 @@ def get_channel_again_order_trend(channel,date):
        reg_order_count reg_count,reg_order_user reg_user,
        round(cost/reg_order_user,2) cost_per_user,
        round(reg_order_amount/reg_order_user,2) avg_order_amount,
-       round(reg_order_user2/reg_order_user,4) avg_again_order_rate,
+       round(reg_order_user_again/reg_order_user,4) avg_again_order_rate,
        order_count
 
         from dw_daily_channel where channel='{channel}' and dt='{date}'
        """
+   print(sql)
    data=ck.execute(sql)
+   print(data)
    key1=['date','channel','book','cost','reg_amount','roi','new_follow','new_follow_per_cost',
          'reg_count','reg_user','cost_per_user','avg_order_amount','avg_again_order_rate','order_count']
    json1=get_dict_list(key1,data)[0]
@@ -169,51 +179,50 @@ def get_channel_again_order_trend(channel,date):
             ) a group by date"""
 
    df=ck.getData_pd(sql2,[['date','c1','c2','c3','c4','c5']])
-   # print(df)
    reg_user=json1["reg_user"]
    li=[]
    for i in range(1,5):
        d1={}
-       d1["origin"]=df.iat[0,i]
+       d1["origin"]=int(df.iat[0,i])
        d1["new"]=0
-       d1["move"]=df.iat[0,i+1]
-       d1["now"]=d1["origin"]+d1['new']-d1["move"]
+       d1["move"]=int(df.iat[0,i+1])
+       d1["now"]=int(d1["origin"]+d1['new']-d1["move"])
        d1["follow_order_rate"]=round(d1["now"]/reg_user,2)
        d2={}
-       d2["origin"] = d1["now"]
-       d2["new"] = df.iat[1,i]
-       d2["move"] = df.iat[1, i+1]
-       d2["now"] = d2["origin"] +d2['new']- d2["move"]
+       d2["origin"] = int(d1["now"])
+       d2["new"] = int(df.iat[1,i])
+       d2["move"] = int(df.iat[1, i+1])
+       d2["now"] = int(d2["origin"] +d2['new']- d2["move"])
        d2["follow_order_rate"] = round(d2["now"] / reg_user, 2)
        d3={}
-       d3["origin"] = d2["now"]
-       d3["new"] = df.iat[2, i]
-       d3["move"] = df.iat[2, i+1]
-       d3["now"] = d3["origin"] +d3['new']- d3["move"]
+       d3["origin"] = int(d2["now"])
+       d3["new"] = int(df.iat[2, i])
+       d3["move"] = int(df.iat[2, i+1])
+       d3["now"] = int(d3["origin"] +d3['new']- d3["move"])
        d3["follow_order_rate"] = round(d3["now"] / reg_user, 2)
        d4={}
-       d4["origin"] = d3["now"]
-       d4["new"] = df.iat[3, i]
-       d4["move"] = df.iat[3, i+1]
-       d4["now"] = d4["origin"] +d4['new']- d4["move"]
+       d4["origin"] = int(d3["now"])
+       d4["new"] = int(df.iat[3, i])
+       d4["move"] = int(df.iat[3, i+1])
+       d4["now"] = int(d4["origin"] +d4['new']- d4["move"])
        d4["follow_order_rate"] = round(d4["now"] / reg_user, 2)
        d5={}
-       d5["origin"] = d4["now"]
-       d5["new"] = df.iat[4, i]
-       d5["move"] = df.iat[4, i+1]
-       d5["now"] = d5["origin"] +d5['new']- d5["move"]
+       d5["origin"] = int(d4["now"])
+       d5["new"] = int(df.iat[4, i])
+       d5["move"] = int(df.iat[4, i+1])
+       d5["now"] = int(d5["origin"] +d5['new']- d5["move"])
        d5["follow_order_rate"] = round(d4["now"] / reg_user, 2)
        d6 = {}
-       d6["origin"] = d5["now"]
-       d6["new"] = df.iat[5, i]
-       d6["move"] = df.iat[5, i+1]
-       d6["now"] = d6["origin"] +d6['new']- d6["move"]
+       d6["origin"] = int(d5["now"])
+       d6["new"] = int(df.iat[5, i])
+       d6["move"] = int(df.iat[5, i+1])
+       d6["now"] = int(d6["origin"] +d6['new']- d6["move"])
        d6["follow_order_rate"] = round(d6["now"] / reg_user, 2)
        d7 = {}
-       d7["origin"] = d6["now"]
-       d7["new"] = df.iat[6, i]
-       d7["move"] = df.iat[6, i+1]
-       d7["now"] = d7["origin"] +d7['new']- d7["move"]
+       d7["origin"] = int(d6["now"])
+       d7["new"] = int(df.iat[6, i])
+       d7["move"] = int(df.iat[6, i+1])
+       d7["now"] = int(d7["origin"] +d7['new']- d7["move"])
        d7["follow_order_rate"] = round(d7["now"] / reg_user, 2)
        d={}
        d["user_order_count"]=i
@@ -226,10 +235,12 @@ def get_channel_again_order_trend(channel,date):
        d['d7']=d7
        li.append(d)
    json1['data']=li
+   print([json1])
    return [json1]
 
 
 def get_channel_active(channel,start,end,page,page_size,order_by,order):
+    print(channel,)
     sql=f"""select formatDateTime(a.dt,'%Y-%m-%d') date, '{channel}' channel,book,cost,reg_amount,roi,new_follow_user,new_follow_per_cost,order_user,order_count,
        order_user_per_cost,day7_avg_act_rate,day7_avg_act_per_cost,day30_avg_act_rate,ay30_avg_act_cost,
        act_per_cost,
@@ -316,6 +327,7 @@ select toDate(formatDateTime(reg_time,'%Y-%m-%d')) dt,
        from order where  channel='{channel}' and dt>='{start}' group by formatDateTime(reg_time,'%Y-%m-%d')) b on a.dt=b.dt 
        order by {order_by} {order} limit {page},{page_size} 
 """
+    print(sql)
     data=ck.execute(sql)
     key=['date','channel','book','cost','reg_amount','roi','new_follow_user','new_follow_per_cost','order_user','order_count','order_user_per_cost',
          'day7_avg_act_rate','day7_avg_act_per_cost','day30_avg_act_rate','day30_avg_act_cost','act_per_cost','d1','d2','d3','d4','d5','d6','d7','d8','d9','d10',
@@ -371,8 +383,8 @@ def get_channel_order_trend(channel,start,end):
     return a
 
 
-def get_channel_summary(channel,pitcher):
-    sql = """select a.channel,state,'朋友圈' location,toString(start),toString(end),total_cost,total_amount,
+def get_channel_summary(channel,pitcher,page,page_size,order_by,order):
+    sql = """select a.channel,state,'朋友圈' location,toString(start) start,toString(end) end,total_cost,total_amount,
                         profit,roi,follow_user,follow_per_cost,order_user,
                 if(follow_user=0,0,order_user/follow_user) order_tran_rate,if(order_user=0,0,total_cost/order_user) order_tran_cost
                 from
@@ -404,7 +416,12 @@ def get_channel_summary(channel,pitcher):
         sql=sql.format('')
     if channel!='':
         sql+=f" and channel='{channel}'"
-    return ck.execute(sql)
+    sql+=f' order by {order_by} {order} limit {page},{page_size} '
+    print(sql)
+    key=['channel','state','location','start','end','total_cost','total_amount','profit','roi',
+         'follow_user','follow_per_cost','order_user','order_tran_rate','order_tran_cost']
+
+    return get_dict_list(key,get_round(ck.execute(sql)))
 
 
 

handlers/HandlerBase.py

@@ -6,7 +6,7 @@ from tornado.web import RequestHandler
 from model.log import logger
 from model.common import errors
 log = logger()
-
+from model.CommonUtils import NpEncoder
 
 class BaseHandler(RequestHandler):
     def __init__(self, application, request, **kwargs):
@@ -37,6 +37,9 @@ class BaseHandler(RequestHandler):
     def write_json(self, data, status_code=200, msg='success'):
         self.write(json.dumps({'status': {'msg': msg, "RetCode": status_code}, 'data': data}))
 
+
+
+
     def get_args(self):
         di=json.loads(self.request.body.decode())
         if isinstance(di,str):
@@ -78,4 +81,3 @@ class BaseHandler(RequestHandler):
             # return True if ur.r.get(key) else False
             return True
 
-

handlers/PitcherPanelHandler.py

@@ -58,6 +58,7 @@ class ChannelOverview(BaseHandler):
         args=self.get_args()
         print(args)
         channel=args.get("channel",'')
+        pitcher=args.get("pitcher",'')
         start=args.get("start",'')
         end=args.get("start",'')
         date_range=args.get("date_range",'')
@@ -68,7 +69,7 @@ class ChannelOverview(BaseHandler):
         if isinstance(date_range,int):
             end = du.get_n_days(-1)
             start = du.get_n_days(-date_range)
-        data =get_channel_overview(channel,start,end,page,page_size,order_by,order)
+        data =get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data)
 
 
@@ -88,8 +89,8 @@ class ChannelActive(BaseHandler):
         args = self.get_args()
         print(args)
         channel = args.get("channel", '')
-        start = args.get("start", '')
-        end = args.get("start", '')
+        start = args.get("start", du.get_n_days(-30))
+        end = args.get("start", du.get_n_days(-1))
         date_range = args.get("date_range", '')
         page = args.get("page", '1')
         page_size = args.get("page_size", '10')
@@ -124,8 +125,11 @@ class ChannelSummary(BaseHandler):
         print(arg)
         channel=arg.get('channel','')
         pitcher=arg.get('pitcher','')
-
-        self.write_json(get_channel_summary(channel,pitcher))
+        page = arg.get("page", '1')
+        page_size = arg.get("page_size", '10')
+        order_by = arg.get("order_by", 'total_cost')
+        order = arg.get("order", 'desc')
+        self.write_json(get_channel_summary(channel,pitcher,page,page_size,order_by,order))