飞书推送优化

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

@@ -33,6 +33,9 @@
     <sql id="shareIaaAmount">
         round(ifnull(sum(share_iaa_amount), 0), 2) as share_iaa_amount
     </sql>
+    <sql id="shareIaaAmount3">
+        round(ifnull(sum(share_iaa_amount_3), 0), 2) as share_iaa_amount_3
+    </sql>
     <sql id="iaaAmount">
         round(ifnull(sum(iaa_amount), 0), 2) as iaa_amount
     </sql>
@@ -175,6 +178,8 @@
         <include refid="realCostAmount"/>,
         <include refid="iaaRoi"/>,
         <include refid="iapRoi"/>,
+        <include refid="sharePayAmount"/>,
+        <include refid="shareIaaAmount3"/>,
         round(ifnull(sum(hour_cost_amount), 0), 2) as hour_cost_amount
         from
         (select product_id from application.media_product_report_daily where stat_date=${date} and ma_appid in (select app_id from tidb.deepthink.mini_app_info where business_type not in (2,4,6))
@@ -422,6 +427,8 @@
         select tb5.dept_id, tb5.dept_name,
         rank() over (order by sum(cost_amount) desc) as rk,
         <include refid="costAmount"/>,
+        <include refid="sharePayAmount"/>,
+        <include refid="shareIaaAmount3"/>,
         <include refid="iaaRoi"/>,
         <include refid="iapRoi"/>
         from

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

@@ -32,7 +32,7 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
     public static final String APP_KEY = "OUlg7WTa6UWZItfTmJw2JdQvhVI4VcRj";
 
     public static final String TEMPLATE_ID = "AAqBGlVblKabY";
-    public static final String TEMPLATE_VERSION = "1.0.15";
+    public static final String TEMPLATE_VERSION = "1.0.18";
     @Autowired
     ReportsAdPushMapper reportsPushMapper;
 
@@ -124,11 +124,15 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
             JSONObject obj = new JSONObject();
             obj.put("movieName", m.getString("movie_name"));
 //            obj.put("movieNameColor", movieNameColor);
-            obj.put("endAmount", m.get("water_end_amount"));
+//            obj.put("endAmount", m.get("water_end_amount"));
 //            obj.put("movieRealRoi", m.get("real_roi"));
             obj.put("hourCostAmount", m.get("hour_cost_amount"));
-            obj.put("iaaRoi", m.get("iaa_roi"));
-            obj.put("iapRoi", m.get("iap_roi"));
+            String iaaRoi = String.valueOf(m.get("iaa_roi"));
+            String iapRoi = String.valueOf(m.get("iap_roi"));
+            String iaaAmount = String.valueOf(m.get("share_iaa_amount_3"));
+            String iapAmount = String.valueOf(m.get("share_pay_amount"));
+            obj.put("iaaRoi", iaaRoi+"\n\r"+iaaAmount);
+            obj.put("iapRoi", iapRoi+"\n\r"+iapAmount);
             String movieProjectSource = String.valueOf(m.get("movie_project_source"));
             String movieProjectSourceName = String.valueOf(m.get("movie_project_source_name"));
             JSONArray ms = new JSONArray();

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

@@ -187,8 +187,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")));
+            obj.put("iapRoi", String.valueOf(dept.get("iap_roi"))+"\n"+String.valueOf(dept.get("share_pay_amount")));
+            obj.put("iaaRoi", String.valueOf(dept.get("iaa_roi"))+"\n"+String.valueOf(dept.get("share_iaa_amount_3")));
             deptRank.add(obj);
         }