Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/AdUnitReportServiceImpl.java
yumeng 3 years ago
parent
commit
46fca26df1

+ 3 - 0
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/entity/KuaishouAccountAdSceneReportDaily.java

@@ -330,6 +330,8 @@ public class KuaishouAccountAdSceneReportDaily {
   private BigDecimal eventAppointJumpClickRatio;
   private BigDecimal eventCreditGrantLandingRatio;
 
+  private BigDecimal eventPayPurchaseAmountOneDayByConversion;
+
 
 
   public static KuaishouAccountAdSceneReportDaily getKuaishouAccountAdsecneInfo(JSONObject returnJson){
@@ -463,6 +465,7 @@ public class KuaishouAccountAdSceneReportDaily {
     reportDaily.setAdPhotoPlayed2sRatio(returnJson.getBigDecimal("ad_photo_played_2s_ratio"));
     reportDaily.setEventOutboundCallRatio(returnJson.getBigDecimal("event_outbound_call_ratio"));
     reportDaily.setEventAdWatchTimes(returnJson.getLong("event_ad_watch_times"));
+    reportDaily.setEventPayPurchaseAmountOneDayByConversion(returnJson.getBigDecimal("event_pay_purchase_amount_one_day_by_conversion"));
     return reportDaily;
   }
 

+ 5 - 0
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/entity/KuaishouAccountReportDaily.java

@@ -327,4 +327,9 @@ public class KuaishouAccountReportDaily {
   private BigDecimal eventAppointJumpClickCost;
   private BigDecimal eventAppointJumpClickRatio;
   private BigDecimal eventCreditGrantLandingRatio;
+
+  /**
+   * 激活后24h付费金额(激活时间)
+   */
+  private BigDecimal eventPayPurchaseAmountOneDayByConversion;
 }

+ 6 - 0
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/entity/KuaishouAccountReportHourly.java

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.math.BigDecimal;
+
 /**
  * 快手-账户时报
  *
@@ -542,4 +544,8 @@ public class KuaishouAccountReportHourly {
   @Excel(name = " 广告观看次数", width = 15)
   @ApiModelProperty(value = " 广告观看次数")
   private Long eventAdWatchTimes;
+
+
+  @ApiModelProperty(value = " 激活后24h付费金额(激活时间)")
+  private BigDecimal eventPayPurchaseAmountOneDayByConversion;
 }

+ 5 - 3
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaishouAccountAdSceneReportDailyMapper.xml

@@ -133,7 +133,9 @@
         `event_measurement_house`,
         `ad_photo_played_2s_ratio`,
         `event_outbound_call_ratio`,
-        `event_ad_watch_times`
+        `event_ad_watch_times`,
+        `event_pay_purchase_amount_one_day_by_conversion`
+
 
         )
         values
@@ -267,8 +269,8 @@
             #{add.eventMeasurementHouse},
             #{add.adPhotoPlayed2sRatio},
             #{add.eventOutboundCallRatio},
-            #{add.eventAdWatchTimes}
-
+            #{add.eventAdWatchTimes},
+            #{add.eventPayPurchaseAmountOneDayByConversion}
             )
         </foreach>
     </insert>

+ 4 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaishouAccountReportDailyMapper.xml

@@ -132,7 +132,8 @@
         `event_measurement_house`,
         `ad_photo_played_2s_ratio`,
         `event_outbound_call_ratio`,
-        `event_ad_watch_times`
+        `event_ad_watch_times`,
+        `event_pay_purchase_amount_one_day_by_conversion`
 
         )
         values
@@ -266,7 +267,8 @@
             #{add.eventMeasurementHouse},
             #{add.adPhotoPlayed2sRatio},
             #{add.eventOutboundCallRatio},
-            #{add.eventAdWatchTimes}
+            #{add.eventAdWatchTimes},
+            #{add.eventPayPurchaseAmountOneDayByConversion}
 
             )
         </foreach>

+ 4 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaishouAccountReportHourlyMapper.xml

@@ -133,7 +133,8 @@
         `event_measurement_house`,
         `ad_photo_played_2s_ratio`,
         `event_outbound_call_ratio`,
-        `event_ad_watch_times`
+        `event_ad_watch_times`,
+        `event_pay_purchase_amount_one_day_by_conversion`
 
         )
         values
@@ -268,7 +269,8 @@
             #{add.eventMeasurementHouse},
             #{add.adPhotoPlayed2sRatio},
             #{add.eventOutboundCallRatio},
-            #{add.eventAdWatchTimes}
+            #{add.eventAdWatchTimes},
+            #{add.eventPayPurchaseAmountOneDayByConversion}
 
             )
         </foreach>

+ 2 - 0
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaishouAccountReportDailyServiceImpl.java

@@ -195,6 +195,8 @@ public class KuaishouAccountReportDailyServiceImpl extends ServiceImpl<KuaishouA
             reportDaily.setAdPhotoPlayed2sRatio(returnJson.getBigDecimal("ad_photo_played_2s_ratio"));
             reportDaily.setEventOutboundCallRatio(returnJson.getBigDecimal("event_outbound_call_ratio"));
             reportDaily.setEventAdWatchTimes(returnJson.getLong("event_ad_watch_times"));
+            reportDaily.setEventPayPurchaseAmountOneDayByConversion(returnJson.getBigDecimal("event_pay_purchase_amount_one_day_by_conversion"));
+
             addList.add(reportDaily);
         }
         accountReportDailyMapper.replaceBatch(addList);

+ 1 - 0
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaishouAccountReportHourlyServiceImpl.java

@@ -198,6 +198,7 @@ public class KuaishouAccountReportHourlyServiceImpl extends ServiceImpl<Kuaishou
             reportHourly.setAdPhotoPlayed2sRatio(returnJson.getBigDecimal("ad_photo_played_2s_ratio"));
             reportHourly.setEventOutboundCallRatio(returnJson.getBigDecimal("event_outbound_call_ratio"));
             reportHourly.setEventAdWatchTimes(returnJson.getLong("event_ad_watch_times"));
+            reportHourly.setEventPayPurchaseAmountOneDayByConversion(returnJson.getBigDecimal("event_pay_purchase_amount_one_day_by_conversion"));
             addList.add(reportHourly);
         }
         accountReportHourlyMapper.replaceBatch(addList);