Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-bytedance into pingkang

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

@@ -22,7 +22,7 @@
         ) 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_3,
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(share_iaa_amount)), 0),2) 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
@@ -84,7 +84,7 @@
         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(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(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
@@ -151,7 +151,7 @@
         ) 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_3,
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(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))
@@ -197,7 +197,7 @@
         ) tb2
         on tb1.advertiser_id = tb2.advertiser_id
         left join (select advertiser_id,
-        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3,
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(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))
@@ -380,7 +380,7 @@
         ) tb2
         on tb1.advertiser_id = tb2.advertiser_id
         left join (select advertiser_id,
-        round(ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0),2) as share_iaa_amount_3,
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(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))
@@ -441,7 +441,7 @@
         ) 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,
-        ifnull(sum(if(share_iaa_amount_3>0,share_iaa_amount_3,share_iaa_amount)), 0) as share_iaa_amount_3
+        round(ifnull(if(sum(share_iaa_amount_3) > 0, sum(share_iaa_amount_3), sum(share_iaa_amount)), 0),2) as share_iaa_amount_3
         from application.user_data_report_daily
         where stat_date = #{date}
         ) tb2

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

@@ -126,7 +126,7 @@ public class OptimizerRankPushServiceImpl implements IOptimizerRankPushService {
             template_variable.put("object_list_5", object_list_5);
             System.out.println("发送目标: nickName: "+nickName+", userId: "+ userId + ", feishuUserId: "+mobileMap.get(phoneNumber)+", rank: "+rank+", costAmount: "+costAmount);
             sendToFeishu(token, template_variable, mobileMap.get(phoneNumber));
-            sendToFeishu(token, template_variable, "44fbaed6");
+//            sendToFeishu(token, template_variable, "44fbaed6");
             //clear
         }
     }