优化师排行播报-更新；整体业务概况

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/ReportsAdPushMapper.xml

@@ -7,31 +7,24 @@
     </select>
     <select id="tmpPushData" resultType="java.util.Map">
         select concat(round(if(ifnull(sum(cost_amount),0)=0, 0, (ifnull(sum(iaa_amount),0)+ifnull(sum(pay_amount), 0))/sum(cost_amount)*100 ), 2), '%') AS water_roi,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
-        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
-        concat(round(if(ifnull(sum(iap_real_cost_amount),0)=0, 0, sum(share_pay_amount)/sum(iap_real_cost_amount)*100), 2), '%') AS iap_roi,
+        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount_3),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
         ifnull(sum(cost_amount),0) AS cost_amount,
         round(ifnull(sum(pay_amount), 0), 2) AS pay_amount,
         ifnull(sum(share_iaa_amount), 0) as share_iaa_amount,
-        ifnull(sum(share_iaa_amount), 0) + ifnull(sum(share_pay_amount), 0) - ifnull(round(sum(real_cost_amount), 2), 0) AS real_profit,
+        ifnull(sum(share_iaa_amount_3), 0) + ifnull(sum(share_pay_amount), 0) - ifnull(round(sum(real_cost_amount), 2), 0) AS real_profit,
         ifnull(sum(iaa_amount), 0) + ifnull(sum(pay_amount), 0) - ifnull(sum(cost_amount), 0) AS water_profit,
         ifnull(sum(share_iaa_amount), 0) + ifnull(sum(share_pay_amount), 0) as end_amount
-        from
-        (select sum(iaa_cost_amount) as iaa_cost_amount, sum(iaa_real_cost_amount) as iaa_real_cost_amount,
-        sum(iap_cost_amount) as iap_cost_amount, sum(iap_real_cost_amount) as iap_real_cost_amount,
-        sum(iaa_cost_amount)+sum(iap_cost_amount) as cost_amount,
-        sum(iaa_real_cost_amount)+sum(iap_real_cost_amount) as real_cost_amount
+
         FROM
-        (select round(ifnull(sum(cost_amount),0),2) as iaa_cost_amount, sum(real_cost_amount) as iaa_real_cost_amount, 0 as iap_cost_amount, 0 as iap_real_cost_amount
-        from application.media_ad_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8) and business_method='IAA')
-        UNION ALL
-        select 0 as iaa_cost_amount, 0 as iaa_real_cost_amount,round(ifnull(sum(cost_amount),0),2) as cost_amount, sum(real_cost_amount) as real_cost_amount
-        from application.media_ad_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8) and business_method='IAP'))subtb2
+        (select sum(cost_amount) as cost_amount, sum(real_cost_amount) as real_cost_amount, max(update_time) as update_time
+        from application.media_ad_report_daily
+        where stat_date = ${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         ) tb1,
         (select sum(pay_amount) as pay_amount,
         sum(iaa_amount) as iaa_amount,
-        ifnull(round(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)),2), 0) as share_iaa_amount,
-        sum(share_pay_amount) as share_pay_amount
+        ifnull(round(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)),2), 0) as share_iaa_amount_3,
+        sum(share_pay_amount) as share_pay_amount,
+        sum(share_iaa_amount) as share_iaa_amount
         from application.user_data_report_daily
         where stat_date = ${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         ) tb2
@@ -64,8 +57,8 @@
         sum(cost_amount) as cost_amount,
         round(sum(real_cost_amount),2) as real_cost_amount,
         concat(round(if(ifnull(sum(cost_amount),0)=0, 0, (sum(iaa_amount)+sum(pay_amount))/sum(cost_amount)*100), 2), '%') AS water_roi,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (sum(share_iaa_amount)+sum(share_pay_amount))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
-        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
+        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (sum(share_iaa_amount_3)+sum(share_pay_amount))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
+        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount_3)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
         concat(round(if(ifnull(sum(iap_real_cost_amount),0)=0, 0, sum(share_pay_amount)/sum(iap_real_cost_amount)*100), 2), '%') AS iap_roi
         from
         (select product_id from application.media_product_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
@@ -90,7 +83,8 @@
         (select movie_id, ifnull(sum(iaa_amount), 0) as iaa_amount,
         ifnull(sum(pay_amount), 0) as pay_amount,
         ifnull(sum(share_pay_amount), 0) as share_pay_amount,
-        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount
+        ifnull(sum(share_iaa_amount), 0) as share_iaa_amount,
+        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3
         from application.user_data_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         group by movie_id
         ) tb3 on tb1.product_id=tb3.movie_id
@@ -132,8 +126,8 @@
         sum(share_iaa_amount)+sum(share_pay_amount) as share_end_amount, sum(end_amount) as end_amount,
         sum(cost_amount) as cost_amount, sum(real_cost_amount) as real_cost_amount,
         concat(round(if(ifnull(sum(cost_amount),0)=0, 0, sum(end_amount)/sum(cost_amount)*100), 2), '%') AS water_roi,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (sum(share_iaa_amount)+sum(share_pay_amount))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
-        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
+        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (sum(share_iaa_amount_3)+sum(share_pay_amount))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
+        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount_3)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
         concat(round(if(ifnull(sum(iap_real_cost_amount),0)=0, 0, sum(share_pay_amount)/sum(iap_real_cost_amount)*100), 2), '%') AS iap_roi,
         round(ifnull(sum(hour_cost_amount), 0), 2) as hour_cost_amount
         from
@@ -157,7 +151,8 @@
         ) tb2 on tb1.product_id=tb2.product_id
         left join
         (select movie_id, ifnull(sum(iaa_amount), 0) + ifnull(sum(pay_amount), 0) as end_amount,
-        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount,
+        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3,
+        ifnull(sum(share_iaa_amount), 0) as share_iaa_amount,
         ifnull(sum(share_pay_amount), 0) as share_pay_amount
         from application.user_data_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         group by movie_id
@@ -180,8 +175,8 @@
         select tb1.user_id, tb4.phonenumber, tb4.nick_name, tb4.dept_id, tb5.dept_name,
         rank() over (order by sum(cost_amount) desc) as rk,
         sum(cost_amount) as cost_amount,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
-        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
+        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount_3),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
+        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount_3)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
         concat(round(if(ifnull(sum(iap_real_cost_amount),0)=0, 0, sum(share_pay_amount)/sum(iap_real_cost_amount)*100), 2), '%') AS iap_roi
         from
         (select cast(advertiser_id as char) advertiser_id, user_id from deepthink.advertiser_bind_info) tb1
@@ -202,7 +197,8 @@
         ) tb2
         on tb1.advertiser_id = tb2.advertiser_id
         left join (select advertiser_id,
-        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount,
+        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3,
+        sum(share_iaa_amount) as share_iaa_amount,
         sum(share_pay_amount) as share_pay_amount
         from application.user_data_report_daily where stat_date=${date}  and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         group by advertiser_id) tb3
@@ -362,8 +358,8 @@
         select tb4.dept_id, tb5.dept_name,
         rank() over (order by sum(cost_amount) desc) as rk,
         ifnull(sum(cost_amount), 0) as cost_amount,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
-        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
+        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount_3),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
+        concat(round(if(ifnull(sum(iaa_real_cost_amount),0)=0, 0, sum(share_iaa_amount_3)/sum(iaa_real_cost_amount)*100), 2), '%') AS iaa_roi,
         concat(round(if(ifnull(sum(iap_real_cost_amount),0)=0, 0, sum(share_pay_amount)/sum(iap_real_cost_amount)*100), 2), '%') AS iap_roi
         from
         (select cast(advertiser_id as char) advertiser_id, user_id from deepthink.advertiser_bind_info) tb1
@@ -384,7 +380,8 @@
         ) tb2
         on tb1.advertiser_id = tb2.advertiser_id
         left join (select advertiser_id,
-        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount,
+        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3,
+        ifnull(sum(share_iaa_amount), 0) as share_iaa_amount,
         sum(share_pay_amount) as share_pay_amount
         from application.user_data_report_daily where stat_date=${date} and ma_appid in (select app_id from deepthink.mini_app_info where business_type in (1,3,8))
         group by advertiser_id) tb3
@@ -431,8 +428,9 @@
         concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, (ifnull(sum(share_iaa_amount),0)+ifnull(sum(share_pay_amount),0))/sum(real_cost_amount)*100), 2), '%') AS real_roi,
         ifnull(sum(cost_amount),0) AS cost_amount,
         round(ifnull(sum(pay_amount), 0), 2) AS pay_amount,
+        round(ifnull(sum(iaa_amount), 0), 2) as iaa_amount,
         ifnull(sum(share_iaa_amount), 0) as share_iaa_amount,
-        ifnull(sum(share_iaa_amount), 0) + ifnull(sum(share_pay_amount), 0) - ifnull(round(sum(real_cost_amount), 2), 0) AS real_profit,
+        round(ifnull(sum(share_iaa_amount_3), 0) + ifnull(sum(share_pay_amount), 0) - ifnull(sum(real_cost_amount), 0) ,2) AS real_profit,
         ifnull(sum(iaa_amount), 0) + ifnull(sum(pay_amount), 0) - ifnull(sum(cost_amount), 0) AS water_profit,
         ifnull(sum(share_iaa_amount), 0) + ifnull(sum(share_pay_amount), 0) as end_amount,
         date_format(update_time, '%Y-%m-%d %H:%i:%s') as update_time
@@ -442,17 +440,18 @@
         where stat_date = #{date}
         ) tb1,
         (select sum(pay_amount) as pay_amount, sum(iaa_amount) as iaa_amount,
-        sum(share_iaa_amount) as share_iaa_amount, sum(share_pay_amount) as share_pay_amount
+        sum(share_iaa_amount) as share_iaa_amount, sum(share_pay_amount) as share_pay_amount,
+        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount_3
         from application.user_data_report_daily
         where stat_date = #{date}
         ) tb2
     </select>
     <select id="allBusinessTopMovie" resultType="java.util.Map">
         select tb4.standard_movie_id, tb4.standard_movie_name as movie_name, group_concat(distinct case tb4.movie_source when 2 then 2 else 1 end) as movie_source,
-        rank() over (order by sum(end_amount) desc) as rk,
-        sum(share_end_amount) as share_end_amount, sum(end_amount) as end_amount,  sum(cost_amount) as cost_amount, sum(real_cost_amount) as real_cost_amount,
-        concat(round(if(ifnull(sum(cost_amount),0)=0, 0, sum(end_amount)/sum(cost_amount)*100), 2), '%') AS water_roi,
-        concat(round(if(ifnull(sum(real_cost_amount),0)=0, 0, sum(share_end_amount)/sum(real_cost_amount)*100), 2), '%') AS real_roi
+        rank() over (order by sum(share_iaa_amount)+sum(share_pay_amount) desc) as rk,
+        round(sum(share_iaa_amount)+sum(share_pay_amount),2) as share_end_amount,
+        round(sum(iaa_amount)+sum(pay_amount),2) as end_amount,
+        sum(cost_amount) as cost_amount
         from
         (select product_id from application.media_product_report_daily where stat_date=${date}
         union select movie_id from application.user_data_report_daily where stat_date=${date}
@@ -463,10 +462,11 @@
         group by product_id
         ) tb2 on tb1.product_id=tb2.product_id
         left join
-        (select movie_id, ifnull(sum(iaa_amount), 0) as iaa_amount,
+        (select movie_id,
+        ifnull(sum(iaa_amount), 0) as iaa_amount,
         ifnull(sum(pay_amount), 0) as pay_amount,
         ifnull(sum(share_pay_amount), 0) as share_pay_amount,
-        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount
+        ifnull(sum(share_iaa_amount), 0) as share_iaa_amount
         from application.user_data_report_daily where stat_date=${date}
         group by movie_id
         ) tb3 on tb1.product_id=tb3.movie_id
@@ -475,12 +475,14 @@
         ) tb4 on tb1.product_id=tb4.moive_id
         where 1=1 and tb1.product_id!='-9999'
         group by tb4.standard_movie_name
-        order by sum(end_amount) desc
+        order by sum(share_iaa_amount)+sum(share_pay_amount) desc
         limit 10
     </select>
     <select id="businessTypeData" resultType="com.alibaba.fastjson.JSONObject">
         select ifnull(sum(share_pay_amount),0) as iap_end_amount,
-        ifnull(sum(share_iaa_amount),0) as iaa_end_amount
+        ifnull(sum(share_iaa_amount),0) as iaa_end_amount,
+        ifnull(sum(share_pay_amount),0) + ifnull(sum(share_iaa_amount),0) as end_amount,
+        ifnull(sum(pay_amount),0)+ ifnull(sum(iaa_amount),0) as water_end_amount
         from application.user_data_report_daily where stat_date=${date}
         and ma_appid in
         (select app_id from deepthink.mini_app_info where business_type in

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/ReportsByBusinessPushServiceImpl.java

@@ -35,7 +35,7 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
     @Autowired
     ReportsAdPushMapper reportsPushMapper;
 
-    private static final String TEMPLATE_VERSION = "1.0.0";
+    private static final String TEMPLATE_VERSION = "1.0.1";
     private static final String TEMPLATE_ID = "AAq4oeDXECopo";
 
 
@@ -105,9 +105,9 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
                 new Pair<>("cost_amount", "消耗金额"),
                 new Pair<>("end_amount", "结算金额"),
                 new Pair<>("pay_amount", "充值金额"),
-                new Pair<>("share_iaa_amount", "广告预估收入"),
+                new Pair<>("iaa_amount", "广告预估收入"),
 //                new Pair<>("water_roi", "流水ROI"),
-                new Pair<>("real_roi", "真实ROI"),
+//                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("water_profit", "流水利润"),
                 new Pair<>("real_profit", "真实利润")
         );
@@ -163,7 +163,6 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
             obj.put("rank", String.valueOf(movie.get("rk")));
             obj.put("movieName", movieName);
             obj.put("endAmount", String.valueOf(movie.get("share_end_amount")));
-            obj.put("realROI", String.valueOf(movie.get("real_roi")));
             movieRankTable.add(obj);
         }
 
@@ -175,6 +174,8 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
             obj.put("deptName", String.valueOf(dept.get("dept_name")));
             obj.put("todayCost", String.valueOf(dept.get("cost_amount")));
             obj.put("ROI", String.valueOf(dept.get("real_roi")));
+            obj.put("iaaRoi", String.valueOf(dept.get("iaa_roi")));
+            obj.put("iapRoi", String.valueOf(dept.get("iap_roi")));
             deptRank.add(obj);
         }
 
@@ -185,24 +186,24 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
         JSONArray businessTypeTable = new JSONArray();
         JSONObject allObj = new JSONObject();
         allObj.put("type", "整体");
-        allObj.put("iap_end_amount", allBusinessData.getString("iap_end_amount"));
-        allObj.put("iaa_end_amount", allBusinessData.getString("iaa_end_amount"));
+        allObj.put("share_income", allBusinessData.getString("end_amount"));
+        allObj.put("water_income", allBusinessData.getString("water_end_amount"));
         businessTypeTable.add(allObj);
         JSONObject b6Obj = new JSONObject();
         b6Obj.put("type", "达人");
-        b6Obj.put("iap_end_amount", b6.getString("iap_end_amount"));
-        b6Obj.put("iaa_end_amount", b6.getString("iaa_end_amount"));
+        b6Obj.put("share_income", b6.getString("end_amount"));
+        b6Obj.put("water_income", b6.getString("water_end_amount"));
         businessTypeTable.add(b6Obj);
-        JSONObject b4Obj = new JSONObject();
-        b4Obj.put("type", "端原生");
-        b4Obj.put("iap_end_amount", b4.getString("iap_end_amount"));
-        b4Obj.put("iaa_end_amount", b4.getString("iaa_end_amount"));
-        businessTypeTable.add(b4Obj);
         JSONObject b2Obj = new JSONObject();
-        b2Obj.put("type", "自分销");
-        b2Obj.put("iap_end_amount", b2.getString("iap_end_amount"));
-        b2Obj.put("iaa_end_amount", b2.getString("iaa_end_amount"));
+        b2Obj.put("type", "分销");
+        b2Obj.put("share_income", b2.getString("end_amount"));
+        b2Obj.put("water_income", b2.getString("water_end_amount"));
         businessTypeTable.add(b2Obj);
+        JSONObject b4Obj = new JSONObject();
+        b4Obj.put("type", "内容分发");
+        b4Obj.put("share_income", b4.getString("end_amount"));
+        b4Obj.put("water_income", b4.getString("water_end_amount"));
+        businessTypeTable.add(b4Obj);