ck 4 роки тому
батько
коміт
03ea3ca9fe
1 змінених файлів з 60 додано та 60 видалено
  1. 60 60
      data_manage/pitcher_panel.py

+ 60 - 60
data_manage/pitcher_panel.py

@@ -292,35 +292,35 @@ def get_channel_active(channel,pitcher,start,end,page,page_size,order_by,order):
        order_user_per_cost,day7_avg_act_rate,day7_avg_act_per_cost,day30_avg_act_rate,ay30_avg_act_cost,
        act_per_cost,
        concat(toString(reg_order_user1),',',toString(if(reg_order_user1=0,0,cost/reg_order_user1)),',',toString(if(order_user=0,0,reg_order_user1/order_user))),
-       concat(toString(reg_order_user2),',',toString(if(reg_order_user2=0,0,cost/reg_order_user2)),',',toString(if(order_user=0,0,reg_order_user2/order_user))),
-       concat(toString(reg_order_user3),',',toString(if(reg_order_user3=0,0,cost/reg_order_user3)),',',toString(if(order_user=0,0,reg_order_user3/order_user))),
-       concat(toString(reg_order_user4),',',toString(if(reg_order_user4=0,0, cost/reg_order_user4)),',',toString(if(order_user=0,0,reg_order_user4/order_user))),
-       concat(toString(reg_order_user5),',',toString(if(reg_order_user5=0,0 ,cost/reg_order_user5)),',',toString(if(order_user=0,0,reg_order_user5/order_user))),
-       concat(toString(reg_order_user6),',',toString(if(reg_order_user6=0,0,cost/reg_order_user6)),',',toString(if(order_user=0,0,reg_order_user6/order_user))),
-       concat(toString(reg_order_user7),',',toString(if(reg_order_user7=0,0,cost/reg_order_user7)),',',toString(if(order_user=0,0,reg_order_user7/order_user))),
-       concat(toString(reg_order_user8),',',toString(if(reg_order_user8=0,0,cost/reg_order_user8)),',',toString(if(order_user=0,0,reg_order_user8/order_user))),
-       concat(toString(reg_order_user9),',',toString(if(reg_order_user9=0,0,cost/reg_order_user9)),',',toString(if(order_user=0,0,reg_order_user9/order_user))),
-       concat(toString(reg_order_user10),',',toString(if(reg_order_user10=0,0,cost/reg_order_user10)),',',toString(if(order_user=0,0,reg_order_user10/order_user))),
-       concat(toString(reg_order_user11),',',toString(if(reg_order_user11=0,0,cost/reg_order_user11)),',',toString(if(order_user=0,0,reg_order_user11/order_user))),
-       concat(toString(reg_order_user12),',',toString(if(reg_order_user12=0,0,cost/reg_order_user12)),',',toString(if(order_user=0,0,reg_order_user12/order_user))),
-       concat(toString(reg_order_user13),',',toString(if(reg_order_user13=0,0,cost/reg_order_user13)),',',toString(if(order_user=0,0,reg_order_user13/order_user))),
-       concat(toString(reg_order_user14),',',toString(if(reg_order_user14=0,0,cost/reg_order_user14)),',',toString(if(order_user=0,0,reg_order_user14/order_user))),
-       concat(toString(reg_order_user15),',',toString(if(reg_order_user15=0,0,cost/reg_order_user15)),',',toString(if(order_user=0,0,reg_order_user15/order_user))),
-       concat(toString(reg_order_user16),',',toString(if(reg_order_user16=0,0,cost/reg_order_user16)),',',toString(if(order_user=0,0,reg_order_user16/order_user))),
-       concat(toString(reg_order_user17),',',toString(if(reg_order_user17=0,0,cost/reg_order_user17)),',',toString(if(order_user=0,0,reg_order_user17/order_user))),
-       concat(toString(reg_order_user18),',',toString(if(reg_order_user18=0,0,cost/reg_order_user18)),',',toString(if(order_user=0,0,reg_order_user18/order_user))),
-       concat(toString(reg_order_user19),',',toString(if(reg_order_user19=0,0,cost/reg_order_user19)),',',toString(if(order_user=0,0,reg_order_user19/order_user))),
-       concat(toString(reg_order_user20),',',toString(if(reg_order_user20=0,0,cost/reg_order_user20)),',',toString(if(order_user=0,0,reg_order_user20/order_user))),
-       concat(toString(reg_order_user21),',',toString(if(reg_order_user21=0,0,cost/reg_order_user21)),',',toString(if(order_user=0,0,reg_order_user21/order_user))),
-       concat(toString(reg_order_user22),',',toString(if(reg_order_user22=0,0,cost/reg_order_user22)),',',toString(if(order_user=0,0,reg_order_user22/order_user))),
-       concat(toString(reg_order_user23),',',toString(if(reg_order_user23=0,0,cost/reg_order_user23)),',',toString(if(order_user=0,0,reg_order_user23/order_user))),
-       concat(toString(reg_order_user24),',',toString(if(reg_order_user24=0,0,cost/reg_order_user24)),',',toString(if(order_user=0,0,reg_order_user24/order_user))),
-       concat(toString(reg_order_user25),',',toString(if(reg_order_user25=0,0,cost/reg_order_user25)),',',toString(if(order_user=0,0,reg_order_user25/order_user))),
-       concat(toString(reg_order_user26),',',toString(if(reg_order_user26=0,0,cost/reg_order_user26)),',',toString(if(order_user=0,0,reg_order_user26/order_user))),
-       concat(toString(reg_order_user27),',',toString(if(reg_order_user27=0,0,cost/reg_order_user27)),',',toString(if(order_user=0,0,reg_order_user27/order_user))),
-       concat(toString(reg_order_user28),',',toString(if(reg_order_user28=0,0,cost/reg_order_user28)),',',toString(if(order_user=0,0,reg_order_user28/order_user))),
-       concat(toString(reg_order_user29),',',toString(if(reg_order_user29=0,0,cost/reg_order_user29)),',',toString(if(order_user=0,0,reg_order_user29/order_user))),
-       concat(toString(reg_order_user30),',',toString(if(reg_order_user30=0,0,cost/reg_order_user30)),',',toString(if(order_user=0,0,reg_order_user30/order_user)))
+       concat(toString(reg_order_user2-reg_order_user1),',',toString(if(reg_order_user2=0,0,cost/reg_order_user2)),',',toString(if(order_user=0,0,(reg_order_user2-reg_order_user1)/order_user))),
+       concat(toString(reg_order_user3-reg_order_user2),',',toString(if(reg_order_user3=0,0,cost/reg_order_user3)),',',toString(if(order_user=0,0,(reg_order_user3-reg_order_user2)/order_user))),
+       concat(toString(reg_order_user4-reg_order_user3),',',toString(if(reg_order_user4=0,0,cost/reg_order_user4)),',',toString(if(order_user=0,0,(reg_order_user4-reg_order_user3)/order_user))),
+       concat(toString(reg_order_user5-reg_order_user4),',',toString(if(reg_order_user5=0,0,cost/reg_order_user5)),',',toString(if(order_user=0,0,(reg_order_user5-reg_order_user4)/order_user))),
+       concat(toString(reg_order_user6-reg_order_user5),',',toString(if(reg_order_user6=0,0,cost/reg_order_user6)),',',toString(if(order_user=0,0,(reg_order_user6-reg_order_user5)/order_user))),
+       concat(toString(reg_order_user7-reg_order_user6),',',toString(if(reg_order_user7=0,0,cost/reg_order_user7)),',',toString(if(order_user=0,0,(reg_order_user7-reg_order_user6)/order_user))),
+       concat(toString(reg_order_user8-reg_order_user7),',',toString(if(reg_order_user8=0,0,cost/reg_order_user8)),',',toString(if(order_user=0,0,(reg_order_user8-reg_order_user7)/order_user))),
+       concat(toString(reg_order_user9-reg_order_user8),',',toString(if(reg_order_user9=0,0,cost/reg_order_user9)),',',toString(if(order_user=0,0,(reg_order_user9-reg_order_user8)/order_user))),
+       concat(toString(reg_order_user10-reg_order_user9),',',toString(if(reg_order_user10=0,0,cost/reg_order_user10)),',',toString(if(order_user=0,0,(reg_order_user10-reg_order_user9)/order_user))),
+       concat(toString(reg_order_user11-reg_order_user10),',',toString(if(reg_order_user11=0,0,cost/reg_order_user11)),',',toString(if(order_user=0,0,(reg_order_user11-reg_order_user10)/order_user))),
+       concat(toString(reg_order_user12-reg_order_user11),',',toString(if(reg_order_user12=0,0,cost/reg_order_user12)),',',toString(if(order_user=0,0,(reg_order_user12-reg_order_user11)/order_user))),
+       concat(toString(reg_order_user13-reg_order_user12),',',toString(if(reg_order_user13=0,0,cost/reg_order_user13)),',',toString(if(order_user=0,0,(reg_order_user13-reg_order_user12)/order_user))),
+       concat(toString(reg_order_user14-reg_order_user13),',',toString(if(reg_order_user14=0,0,cost/reg_order_user14)),',',toString(if(order_user=0,0,(reg_order_user14-reg_order_user13)/order_user))),
+       concat(toString(reg_order_user15-reg_order_user14),',',toString(if(reg_order_user15=0,0,cost/reg_order_user15)),',',toString(if(order_user=0,0,(reg_order_user15-reg_order_user14)/order_user))),
+       concat(toString(reg_order_user16-reg_order_user15),',',toString(if(reg_order_user16=0,0,cost/reg_order_user16)),',',toString(if(order_user=0,0,(reg_order_user16-reg_order_user15)/order_user))),
+       concat(toString(reg_order_user17-reg_order_user16),',',toString(if(reg_order_user17=0,0,cost/reg_order_user17)),',',toString(if(order_user=0,0,(reg_order_user17-reg_order_user16)/order_user))),
+       concat(toString(reg_order_user18-reg_order_user17),',',toString(if(reg_order_user18=0,0,cost/reg_order_user18)),',',toString(if(order_user=0,0,(reg_order_user18-reg_order_user17)/order_user))),
+       concat(toString(reg_order_user19-reg_order_user18),',',toString(if(reg_order_user19=0,0,cost/reg_order_user19)),',',toString(if(order_user=0,0,(reg_order_user19-reg_order_user18)/order_user))),
+       concat(toString(reg_order_user20-reg_order_user19),',',toString(if(reg_order_user20=0,0,cost/reg_order_user20)),',',toString(if(order_user=0,0,(reg_order_user20-reg_order_user19)/order_user))),
+       concat(toString(reg_order_user21-reg_order_user20),',',toString(if(reg_order_user21=0,0,cost/reg_order_user21)),',',toString(if(order_user=0,0,(reg_order_user21-reg_order_user20)/order_user))),
+       concat(toString(reg_order_user22-reg_order_user31),',',toString(if(reg_order_user22=0,0,cost/reg_order_user22)),',',toString(if(order_user=0,0,(reg_order_user22-reg_order_user21)/order_user))),
+       concat(toString(reg_order_user23-reg_order_user22),',',toString(if(reg_order_user23=0,0,cost/reg_order_user23)),',',toString(if(order_user=0,0,(reg_order_user23-reg_order_user22)/order_user))),
+       concat(toString(reg_order_user24-reg_order_user23),',',toString(if(reg_order_user24=0,0,cost/reg_order_user24)),',',toString(if(order_user=0,0,(reg_order_user24-reg_order_user23)/order_user))),
+       concat(toString(reg_order_user25-reg_order_user24),',',toString(if(reg_order_user25=0,0,cost/reg_order_user25)),',',toString(if(order_user=0,0,(reg_order_user25-reg_order_user24)/order_user))),
+       concat(toString(reg_order_user26-reg_order_user25),',',toString(if(reg_order_user26=0,0,cost/reg_order_user26)),',',toString(if(order_user=0,0,(reg_order_user26-reg_order_user25)/order_user))),
+       concat(toString(reg_order_user27-reg_order_user26),',',toString(if(reg_order_user27=0,0,cost/reg_order_user27)),',',toString(if(order_user=0,0,(reg_order_user27-reg_order_user26)/order_user))),
+       concat(toString(reg_order_user28-reg_order_user27),',',toString(if(reg_order_user28=0,0,cost/reg_order_user28)),',',toString(if(order_user=0,0,(reg_order_user28-reg_order_user27)/order_user))),
+       concat(toString(reg_order_user29-reg_order_user28),',',toString(if(reg_order_user29=0,0,cost/reg_order_user29)),',',toString(if(order_user=0,0,(reg_order_user29-reg_order_user28)/order_user))),
+       concat(toString(reg_order_user30-reg_order_user29),',',toString(if(reg_order_user30=0,0,cost/reg_order_user30)),',',toString(if(order_user=0,0,(reg_order_user30-reg_order_user29)/order_user)))
 
        from (
 
@@ -341,37 +341,37 @@ select dt,book,cost,
 left outer join (
 
 select toDate(formatDateTime(reg_time,'%Y-%m-%d')) dt,
-       count(distinct if(subtractDays(date, 0)=reg_time,user_id,NULL)) reg_order_user1,
-       count(distinct if(subtractDays(date, 1)=reg_time,user_id,NULL)) reg_order_user2,
-       count(distinct if(subtractDays(date, 2)=reg_time,user_id,NULL)) reg_order_user3,
-       count(distinct if(subtractDays(date, 3)=reg_time,user_id,NULL)) reg_order_user4,
-       count(distinct if(subtractDays(date, 4)=reg_time,user_id,NULL)) reg_order_user5,
-       count(distinct if(subtractDays(date, 5)=reg_time,user_id,NULL)) reg_order_user6,
-       count(distinct if(subtractDays(date, 6)=reg_time,user_id,NULL)) reg_order_user7,
-       count(distinct if(subtractDays(date, 7)=reg_time,user_id,NULL)) reg_order_user8,
-       count(distinct if(subtractDays(date, 8)=reg_time,user_id,NULL)) reg_order_user9,
-       count(distinct if(subtractDays(date, 9)=reg_time,user_id,NULL)) reg_order_user10,
-       count(distinct if(subtractDays(date, 10)=reg_time,user_id,NULL)) reg_order_user11,
-       count(distinct if(subtractDays(date, 11)=reg_time,user_id,NULL)) reg_order_user12,
-       count(distinct if(subtractDays(date, 12)=reg_time,user_id,NULL)) reg_order_user13,
-       count(distinct if(subtractDays(date, 13)=reg_time,user_id,NULL)) reg_order_user14,
-       count(distinct if(subtractDays(date, 14)=reg_time,user_id,NULL)) reg_order_user15,
-       count(distinct if(subtractDays(date, 15)=reg_time,user_id,NULL)) reg_order_user16,
-       count(distinct if(subtractDays(date, 16)=reg_time,user_id,NULL)) reg_order_user17,
-       count(distinct if(subtractDays(date, 17)=reg_time,user_id,NULL)) reg_order_user18,
-       count(distinct if(subtractDays(date, 18)=reg_time,user_id,NULL)) reg_order_user19,
-       count(distinct if(subtractDays(date, 19)=reg_time,user_id,NULL)) reg_order_user20,
-       count(distinct if(subtractDays(date, 20)=reg_time,user_id,NULL)) reg_order_user21,
-       count(distinct if(subtractDays(date, 21)=reg_time,user_id,NULL)) reg_order_user22,
-       count(distinct if(subtractDays(date, 22)=reg_time,user_id,NULL)) reg_order_user23,
-       count(distinct if(subtractDays(date, 23)=reg_time,user_id,NULL)) reg_order_user24,
-       count(distinct if(subtractDays(date, 24)=reg_time,user_id,NULL)) reg_order_user25,
-       count(distinct if(subtractDays(date, 25)=reg_time,user_id,NULL)) reg_order_user26,
-       count(distinct if(subtractDays(date, 26)=reg_time,user_id,NULL)) reg_order_user27,
-       count(distinct if(subtractDays(date, 27)=reg_time,user_id,NULL)) reg_order_user28,
-       count(distinct if(subtractDays(date, 28)=reg_time,user_id,NULL)) reg_order_user29,
-       count(distinct if(subtractDays(date, 29)=reg_time,user_id,NULL)) reg_order_user30
-       from order where  channel='{channel}' and dt>='{start}'  group by formatDateTime(reg_time,'%Y-%m-%d')) b on a.dt=b.dt 
+       count(distinct if(subtractDays(date, 1)>=reg_time,NULL,user_id)) reg_order_user1,
+       count(distinct if(subtractDays(date, 2)>=reg_time,NULL,user_id)) reg_order_user2,
+       count(distinct if(subtractDays(date, 3)>=reg_time,NULL,user_id)) reg_order_user3,
+       count(distinct if(subtractDays(date, 4)>=reg_time,NULL,user_id)) reg_order_user4,
+       count(distinct if(subtractDays(date, 5)>=reg_time,NULL,user_id)) reg_order_user5,
+       count(distinct if(subtractDays(date, 6)>=reg_time,NULL,user_id)) reg_order_user6,
+       count(distinct if(subtractDays(date, 7)>=reg_time,NULL,user_id)) reg_order_user7,
+       count(distinct if(subtractDays(date, 8)>=reg_time,NULL,user_id)) reg_order_user8,
+       count(distinct if(subtractDays(date, 9)>=reg_time,NULL,user_id)) reg_order_user9,
+       count(distinct if(subtractDays(date, 10)>=reg_time,NULL,user_id)) reg_order_user10,
+       count(distinct if(subtractDays(date, 11)>=reg_time,NULL,user_id)) reg_order_user11,
+       count(distinct if(subtractDays(date, 12)>=reg_time,NULL,user_id)) reg_order_user12,
+       count(distinct if(subtractDays(date, 13)>=reg_time,NULL,user_id)) reg_order_user13,
+       count(distinct if(subtractDays(date, 14)>=reg_time,NULL,user_id)) reg_order_user14,
+       count(distinct if(subtractDays(date, 15)>=reg_time,NULL,user_id)) reg_order_user15,
+       count(distinct if(subtractDays(date, 16)>=reg_time,NULL,user_id)) reg_order_user16,
+       count(distinct if(subtractDays(date, 17)>=reg_time,NULL,user_id)) reg_order_user17,
+       count(distinct if(subtractDays(date, 18)>=reg_time,NULL,user_id)) reg_order_user18,
+       count(distinct if(subtractDays(date, 19)>=reg_time,NULL,user_id)) reg_order_user19,
+       count(distinct if(subtractDays(date, 20)>=reg_time,NULL,user_id)) reg_order_user20,
+       count(distinct if(subtractDays(date, 21)>=reg_time,NULL,user_id)) reg_order_user21,
+       count(distinct if(subtractDays(date, 22)>=reg_time,NULL,user_id)) reg_order_user22,
+       count(distinct if(subtractDays(date, 23)>=reg_time,NULL,user_id)) reg_order_user23,
+       count(distinct if(subtractDays(date, 24)>=reg_time,NULL,user_id)) reg_order_user24,
+       count(distinct if(subtractDays(date, 25)>=reg_time,NULL,user_id)) reg_order_user25,
+       count(distinct if(subtractDays(date, 26)>=reg_time,NULL,user_id)) reg_order_user26,
+       count(distinct if(subtractDays(date, 27)>=reg_time,NULL,user_id)) reg_order_user27,
+       count(distinct if(subtractDays(date, 28)>=reg_time,NULL,user_id)) reg_order_user28,
+       count(distinct if(subtractDays(date, 29)>=reg_time,NULL,user_id)) reg_order_user29,
+       count(distinct if(subtractDays(date, 30)>=reg_time,NULL,user_id)) reg_order_user30
+       from order where  channel='{channel}' and dt>='{start}' group by formatDateTime(reg_time,'%Y-%m-%d')) b on a.dt=b.dt 
 """
 
     total = ck.execute(f"select count(1) from ({sql}) a")[0][0]