fix 推送任务

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

@@ -180,37 +180,38 @@
         <include refid="iaaRealCostAmount"/>,
         <include refid="iapRealCostAmount"/>
         from
-        (select movie_id from application.media_ad_report_daily where stat_date=${date} and ma_appid in (select app_id from tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10))
-        union select movie_id from application.user_data_report_daily where stat_date=${date} and ma_appid in (select app_id from tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10))
+        (select movie_id, ma_appid from application.media_ad_report_daily where stat_date=${date} and ma_appid in (select app_id from tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10))
+        union select movie_id, ma_appid from application.user_data_report_daily where stat_date=${date} and ma_appid in (select app_id from tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10))
         ) tb1
         left join
-        (select movie_id, sum(iaa_cost_amount) as iaa_cost_amount, sum(iaa_real_cost_amount) as iaa_real_cost_amount,
+        (select movie_id, ma_appid, 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 movie_id, 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
+        (select movie_id, ma_appid, 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 tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10) and business_method='IAA')
-        group by movie_id
+        group by movie_id, ma_appid
         union all
-        select movie_id, 0 as iaa_cost_amount, 0 as iaa_real_cost_amount,
+        select movie_id, ma_appid, 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 tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10) and business_method='IAP')
-        group by movie_id) subt2
-        group by movie_id
-        ) tb2 on tb1.movie_id=tb2.movie_id
+        group by movie_id, ma_appid) subt2
+        group by movie_id, ma_appid
+        ) tb2 on tb1.movie_id=tb2.movie_id and tb1.ma_appid=tb2.ma_appid
         left join
-        (select movie_id, ifnull(sum(iaa_amount), 0) as iaa_amount,
+        (select movie_id, ma_appid, 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(share_iaa_amount), 0) as share_iaa_amount,
         round(ifnull(sum(share_iaa_amount_3), 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 tidb.deepthink.mini_app_info where business_line in (1,6,7,4,8,9,10))
-        group by movie_id
-        ) tb3 on tb1.movie_id=tb3.movie_id
+        group by movie_id, ma_appid
+        ) tb3 on tb1.movie_id=tb3.movie_id and tb1.ma_appid=tb3.ma_appid
+        left join tidb.deepthink.mini_app_info app on tb1.ma_appid=app.app_id
         left join
         (select moive_id, standard_movie_id, standard_movie_name, movie_source, movie_project_source,project_ad_date, ly_movie_name, movie_type from tidb.deepthink.all_moive
-        ) tb4 on tb1.movie_id=tb4.moive_id
+        ) tb4 on tb1.movie_id=tb4.moive_id and find_in_set(tb4.movie_source, app.movie_sources)> 0
         left join
         (select dict_key, dict_name from tidb.deepthink.dt_dictionary where select_key='movie_project_source'
         ) tb5 on tb4.movie_project_source=tb5.dict_key
@@ -753,26 +754,29 @@
         <include refid="waterEndAmount"/>,
         <include refid="costAmount"/>
         from
-        (select movie_id from application.media_ad_report_daily where stat_date=${date}
-        union select movie_id from application.user_data_report_daily where stat_date=${date}
+        (
+        select movie_id, ma_appid from application.media_ad_report_daily where stat_date=${date}
+        union
+        select movie_id, ma_appid from application.user_data_report_daily where stat_date=${date}
         ) tb1
         left join
-        (select movie_id, round(ifnull(sum(cost_amount),0),2) as cost_amount, sum(real_cost_amount) as real_cost_amount
+        (select movie_id, ma_appid, 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}
-        group by movie_id
-        ) tb2 on tb1.movie_id=tb2.movie_id
+        group by movie_id, ma_appid
+        ) tb2 on tb1.movie_id=tb2.movie_id and tb1.ma_appid=tb2.ma_appid
         left join
-        (select movie_id,
+        (select movie_id, ma_appid,
         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(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.movie_id=tb3.movie_id
+        group by movie_id, ma_appid
+        ) tb3 on tb1.movie_id=tb3.movie_id and tb1.ma_appid=tb3.ma_appid
+        left join tidb.deepthink.mini_app_info app on tb1.ma_appid=app.app_id
         left join
         (select moive_id, standard_movie_id, standard_movie_name, movie_source, movie_type, movie_project_source, ly_movie_name from tidb.deepthink.all_moive
-        ) tb4 on tb1.movie_id=tb4.moive_id
+        ) tb4 on tb1.movie_id=tb4.moive_id and find_in_set(tb4.movie_source, app.movie_sources)>0
         left join
         (select dict_key, dict_name from tidb.deepthink.dt_dictionary where select_key='movie_project_source'
         ) tb5 on tb4.movie_project_source=tb5.dict_key