修改总计数据的聚合算法

data_manage/pitcher_panel.py

@@ -1381,7 +1381,7 @@ def get_pitcher_trend(pitcher, start=None, end=None, page=None, page_size=None,
             round(cost/create_user_num,2) create_user_num_cost,  -- 新增创角单价
             round(cost/reg_order_user,2) reg_order_user_cost , -- 至今付费单价
             cost,
-            reg_amount,
+            reg_amount,first_order_amount,
             d1 first_amount,
             round(d1/cost,4) first_roi,
             round(reg_amount/cost,4) roi,
@@ -1434,18 +1434,18 @@ def get_pitcher_trend(pitcher, start=None, end=None, page=None, page_size=None,
     sum(reg_num) reg_num,
     sum(create_user_num) create_user_num,
     sum(reg_amount) reg_amount,
-    sum(round(first_order_user,2)) first_order_user, -- 新增付费人数
-    sum(round(first_order_cost,2)) first_order_cost, -- 新增付费成本
-    sum(round(create_user_per_cost,2)) create_user_per_cost, -- 新注册用户平均付费
-    sum(round(ARPU,2)) ARPU, -- 新增付费ARPU
-    sum(round(first_order_rate,4)) first_order_rate, -- 新增付费率
-    sum(round(order_ARPU,2)) order_ARPU,  -- 付费ARPU
+    round(sum(first_order_user),2) first_order_user, -- 新增付费人数
+    round(sum(cost)/sum(first_order_user),2) first_order_cost, -- 新增付费成本
+    round(sum(cost)/sum(reg_num),2) create_user_per_cost, -- 新注册用户平均付费
+    round(sum(first_order_amount)/sum(first_order_user),2)  ARPU, -- 新增付费ARPU
+    round(sum(first_order_user)/sum(reg_num),4) first_order_rate, -- 新增付费率
+    round(sum(reg_amount)/sum(reg_order_user),2) order_ARPU,  -- 付费ARPU
     sum(hundred_user_num) hundred_user_num, -- 单日付费100+用户数
-    sum(round(hundred_user_num_cost,2)) hundred_user_num_cost, --  单日付费100+用户付费成本
+    round(sum(cost)/sum(hundred_user_num),2) hundred_user_num_cost, --  单日付费100+用户付费成本
     sum(reg_order_user) reg_order_user, -- 至今付费人数
     sum(reg_order_count) reg_order_count, -- 至今付费次数
-    sum(round(create_user_num_cost,2)) create_user_num_cost,  -- 新增创角单价
-    sum(round(reg_order_user_cost,2)) reg_order_user_cost, -- 至今付费单价
+    round(sum(cost)/sum(create_user_num),2) create_user_num_cost,  -- 新增创角单价
+    round(sum(cost)/sum(reg_order_user),2) reg_order_user_cost , -- 至今付费单价
     round(sum(first_amount)/sum(cost),4) first_roi,
     round(sum(reg_amount)/sum(cost),4) roi,
     sum(profit) profit,

data_manage/public_analysis.py

@@ -169,16 +169,16 @@ from book_trend where 1=1  {op1} {op2} {op4} {op5}  {op6}
     sum_sql = f"""select concat(date_format(min(dt),'%Y/%m/%d'),'~',date_format(max(dt),'%Y/%m/%d')) dt,
 sum(cost) cost,
 sum(reg_num) reg_num,
-round(sum(reg_per_cost),2) reg_per_cost, -- 新增用户单价
-round(sum(ARPU),2)  ARPU, -- 新增付费ARPU
-round(sum(order_rate),4) order_rate, -- 新增付费率
-round(sum(order_ARPU),2) order_ARPU,  -- 付费ARPU
+round(sum(cost)/sum(reg_num),2) reg_per_cost, -- 新增用户单价
+round(sum(first_order_amount)/sum(first_order_user),2)  ARPU, -- 新增付费ARPU
+round(sum(first_order_user)/sum(reg_num),4) order_rate, -- 新增付费率
+round(sum(reg_order_amount)/sum(reg_order_user),2) order_ARPU,  -- 付费ARPU
 sum(hundred_user_num) hundred_user_num, -- 单日付费100+用户数
-round(sum(hundred_user_num_cost),2)  hundred_user_num_cost, --  单日付费100+用户付费成本
+round(sum(cost)/sum(hundred_user_num),2) hundred_user_num_cost , --  单日付费100+用户付费成本
 sum(reg_order_count) reg_order_count, -- 至今付费次数
-round(sum(create_user_num_cost),2) create_user_num_cost,  -- 新增创角单价
-round(sum(first_order_amount),2) first_order_amount, -- 新增付费金额
-round(sum(reg_order_amount),2) reg_order_amount, -- 至今付费金额
+round(sum(cost)/sum(create_user_num),2) create_user_num_cost,  -- 新增创角单价
+round(sum(first_order_amount),2) new_order_amount, -- 新增付费金额
+round(sum(reg_order_amount),2) reg_today_order_amount -- 至今付费金额
 sum(create_user_num) create_user_num,
 sum(first_order_amount) first_order_amount,
 sum(reg_order_amount) reg_order_amount,