zhaotx пре 1 година
родитељ
комит
b32084fe12

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

@@ -523,6 +523,7 @@
         <include refid="shareIaaAmount"/>,
         <include refid="shareIaaAmount"/>,
         <include refid="realProfit"/>,
         <include refid="realProfit"/>,
         <include refid="waterProfit"/>,
         <include refid="waterProfit"/>,
+        <include refid="waterEndAmount"/>,
         <include refid="endAmount"/>,
         <include refid="endAmount"/>,
         date_format(max(update_time), '%Y-%m-%d %H:%i:%s') as update_time
         date_format(max(update_time), '%Y-%m-%d %H:%i:%s') as update_time
         from
         from

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

@@ -103,11 +103,12 @@ public class ReportsByBusinessPushServiceImpl implements IReportsByBusinessPushS
 
 
         String updateTime = String.valueOf(todayData.get("update_time"));
         String updateTime = String.valueOf(todayData.get("update_time"));
         List<Pair<String, String>> columns = Arrays.asList(
         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<>("cost_amount", "消耗金额"),
+//                new Pair<>("real_cost_amount", "折后消耗"),
+                new Pair<>("water_end_amount", "流水总收入"),
+                new Pair<>("end_amount", "结算总收入"),
+//                new Pair<>("pay_amount", "充值金额"),
+//                new Pair<>("iaa_amount", "广告预估收入"),
 //                new Pair<>("water_roi", "流水ROI"),
 //                new Pair<>("water_roi", "流水ROI"),
 //                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("real_roi", "真实ROI"),
 //                new Pair<>("water_profit", "流水利润"),
 //                new Pair<>("water_profit", "流水利润"),