推送

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

@@ -46,6 +46,7 @@
     <select id="tmpPushData" resultType="java.util.Map">
         select
         <include refid="costAmount"/>,
+        <include refid="realCostAmount"/>,
         <include refid="payAmount"/>,
         <include refid="shareIaaAmount"/>,
         <include refid="realProfit"/>,
@@ -67,6 +68,7 @@
     <select id="adHourData" resultType="java.util.Map">
         select
         <include refid="costAmount"/>,
+        <include refid="realCostAmount"/>,
         <include refid="payAmount"/>,
         <include refid="shareIaaAmount"/>,
         <include refid="realProfit"/>,
@@ -134,6 +136,7 @@
     <select id="adDailyData" resultType="java.util.Map">
         select
         <include refid="costAmount"/>,
+        <include refid="realCostAmount"/>,
         <include refid="payAmount"/>,
         <include refid="shareIaaAmount"/>,
         <include refid="realProfit"/>,
@@ -454,6 +457,7 @@
     <select id="allBusinessPushData" resultType="java.util.Map">
         select
         <include refid="costAmount"/>,
+        <include refid="realCostAmount"/>,
         <include refid="payAmount"/>,
         <include refid="iaaAmount"/>,
         <include refid="shareIaaAmount"/>,

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

@@ -33,7 +33,7 @@ public class DateReportsPushServiceImpl implements IDateReportsPushService {
     @Autowired
     ReportsAdPushMapper reportsPushMapper;
 
-    private static final String TEMPLATE_VERSION = "1.0.12";
+    private static final String TEMPLATE_VERSION = "1.0.13";
     private static final String TEMPLATE_ID = "AAqRhJzMBoO0E";
 
     /**
@@ -115,13 +115,14 @@ public class DateReportsPushServiceImpl implements IDateReportsPushService {
         String updateTime = reportsPushMapper.updateTime(todayLong);
         List<Pair<String, String>> columns = Arrays.asList(
                 new Pair<>("cost_amount", "消耗金额"),
+                new Pair<>("real_cost_amount", "折后消耗"),
                 new Pair<>("end_amount", "结算金额"),
                 new Pair<>("pay_amount", "充值金额"),
-                new Pair<>("share_iaa_amount", "广告预估收入")
+                new Pair<>("share_iaa_amount", "广告预估收入"),
 //                new Pair<>("water_roi", "流水ROI"),
 //                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("water_profit", "流水利润"),
-//                new Pair<>("real_profit", "真实利润")
+                new Pair<>("real_profit", "真实利润")
 //                new Pair<>("iaa_roi", "广告-ROI"),
 //                new Pair<>("iap_roi", "付费-ROI")
         );

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

@@ -30,7 +30,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.12";
+    public static final String TEMPLATE_VERSION = "1.0.13";
     @Autowired
     ReportsAdPushMapper reportsPushMapper;
 
@@ -88,13 +88,14 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
 
         List<Pair<String, String>> columns = Arrays.asList(
                 new Pair<>("cost_amount", "消耗金额"),
+                new Pair<>("real_cost_amount", "折后消耗"),
                 new Pair<>("end_amount", "结算金额"),
                 new Pair<>("pay_amount", "充值金额"),
-                new Pair<>("share_iaa_amount", "广告预估收入")
+                new Pair<>("share_iaa_amount", "广告预估收入"),
 //                new Pair<>("water_roi", "流水ROI"),
 //                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("water_profit", "流水利润"),
-//                new Pair<>("real_profit", "真实利润")
+                new Pair<>("real_profit", "真实利润")
         );
 
         JSONArray object_list_1 = new JSONArray();

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.2";
+    private static final String TEMPLATE_VERSION = "1.0.3";
     private static final String TEMPLATE_ID = "AAq4oeDXECopo";
 
 
@@ -103,13 +103,14 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
         String updateTime = String.valueOf(todayData.get("update_time"));
         List<Pair<String, String>> columns = Arrays.asList(
                 new Pair<>("cost_amount", "消耗金额"),
+                new Pair<>("real_cost_amount", "折后消耗"),
                 new Pair<>("end_amount", "结算金额"),
                 new Pair<>("pay_amount", "充值金额"),
-                new Pair<>("iaa_amount", "广告预估收入")
+                new Pair<>("iaa_amount", "广告预估收入"),
 //                new Pair<>("water_roi", "流水ROI"),
 //                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("water_profit", "流水利润"),
-//                new Pair<>("real_profit", "真实利润")
+                new Pair<>("real_profit", "真实利润")
         );
         JSONArray dateIndicatorTable = new JSONArray();
         for (Pair<String, String> column : columns) {