修改内容：腾讯广告监控字段修改

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsAdgroupDay.java

@@ -193,54 +193,150 @@ public class AdsAdgroupDay implements Serializable {
     */    
     @Column
     private String balance;
-    
+
     /**
-    * 注册人数 (应用下载广告数据-激活数)
-    */    
+     * 小游戏注册人数
+     */
     @Column
-    private Long active;
-    
+    private Long miniGameRegisterUsers;
+
     /**
-    * 注册成本 (应用下载广告数据-激活成本)
-    */    
+     * 小游戏注册成本
+     */
     @Column
-    private BigDecimal activeCost;
-    
+    private BigDecimal miniGameRegisterCost;
+
     /**
-    * 首日转化数 (转化数据-转化数)
-    */    
+     * 小游戏注册率
+     */
     @Column
-    private Long firstConvertCount;
-    
+    private BigDecimal miniGameRegisterRate;
+
     /**
-    * 首日转化成本 (转化数据-转化成本)
-    */    
+     * 小游戏付费次数
+     */
     @Column
-    private BigDecimal firstConvertCost;
-    
+    private Long miniGamePayingCount;
+
     /**
-    * 首次付费率 (应用下载广告数据-首次付费率)
-    */    
+     * 小游戏付费金额
+     */
     @Column
-    private BigDecimal firstActivePayRate;
-    
+    private BigDecimal miniGamePayingAmount;
+
     /**
-    * 首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)
-    */    
+     * 小游戏首日付费人数
+     */
     @Column
-    private BigDecimal firstAttributionGameInAppLtv1day;
-    
+    private Long miniGamePayingUsersD1;
+
     /**
-    * 首日付费ROI (当日付费ROI)
-    */    
+     * 小游戏首日付费金额
+     */
     @Column
-    private BigDecimal firstAttributionGameInAppRoi1day;
-    
+    private BigDecimal miniGamePayingAmountD1;
+
     /**
-    * 付费次数 (应用下载广告数据-付费次数)
-    */    
+     * 小游戏3日付费金额
+     */
+    @Column
+    private BigDecimal miniGamePayingAmountD3;
+
+    /**
+     * 小游戏7日付费金额
+     */
+    @Column
+    private BigDecimal miniGamePayingAmountD7;
+
+    /**
+     * 小游戏14日付费金额
+     */
+    @Column
+    private BigDecimal miniGamePayingAmountD14;
+
+    /**
+     * 小游戏30日付费金额
+     */
+    @Column
+    private BigDecimal miniGamePayingAmountD30;
+
+    /**
+     * 小游戏首次付费人数
+     */
+    @Column
+    private Long miniGameFirstPayingUsers;
+
+    /**
+     * 小游戏首日付费ROI
+     */
+    @Column
+    private BigDecimal miniGameFirstDayPayingRoi;
+
+    /**
+     * 小游戏付费ROI
+     */
+    @Column
+    private BigDecimal miniGamePayingRoi;
+
+    /**
+     * 小游戏付费ARPU
+     */
+    @Column
+    private BigDecimal miniGamePayingArpu;
+
+    /**
+     * 小游戏3日付费ROI
+     */
+    @Column
+    private BigDecimal miniGamePayD3Roi;
+
+    /**
+     * 小游戏7日付费ROI
+     */
+    @Column
+    private BigDecimal miniGamePayD7Roi;
+
+    /**
+     * 小游戏14日付费ROI
+     */
+    @Column
+    private BigDecimal miniGamePayD14Roi;
+
+    /**
+     * 小游戏30日付费ROI
+     */
+    @Column
+    private BigDecimal miniGamePayD30Roi;
+
+    /**
+     * 小游戏首日付费次数
+     */
+    @Column
+    private Long minigame1dPayCount;
+
+    /**
+     * 小游戏首24小时付费人数
+     */
+    @Column
+    private Long minigame24hPayUv;
+
+    /**
+     * 小游戏首24小时付费金额
+     */
+    @Column
+    private BigDecimal minigame24hPayAmount;
+
+    /**
+     * 小游戏首24小时付费ROI
+     */
+    @Column
+    private BigDecimal minigame24hPayRoi;
+
+    /**
+     * 小游戏首24小时付费ARPU
+     */
     @Column
-    private Long gamePayCount;
+    private BigDecimal minigame24hPayArpu;
     
     /**
     * 今日消耗

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PromotionDayTotalVO.java

@@ -871,6 +871,12 @@ public class PromotionDayTotalVO {
     @ApiModelProperty(value = "ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）")
     private BigDecimal ltvDay1;
 
+    /**
+     * ltv1(实际数据) （首日新用户充值金额 / 注册人数）
+     */
+    @ApiModelProperty(value = "ltv1(实际数据) （首日新用户充值金额 / 注册人数）")
+    private BigDecimal ltvDay1ActualData;
+
     /**
      * 每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PromotionDayVO.java

@@ -1047,6 +1047,12 @@ public class PromotionDayVO {
     @ApiModelProperty(value = "ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）")
     private BigDecimal ltvDay1;
 
+    /**
+     * ltv1(实际数据) （首日新用户充值金额 / 注册人数）
+     */
+    @ApiModelProperty(value = "ltv1(实际数据) （首日新用户充值金额 / 注册人数）")
+    private BigDecimal ltvDay1ActualData;
+
     /**
      * 每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/TencentPromotionDayTotalVO.java

@@ -812,58 +812,148 @@ public class TencentPromotionDayTotalVO {
     private PromotionRechargeTrendVO d15Trend;
 
     /**
-     * 注册人数 (应用下载广告数据-激活数)
+     * 小游戏注册人数
      */
-    @ApiModelProperty(value = "注册人数 (应用下载广告数据-激活数)")
-    private Long active;
+    @ApiModelProperty(value = "小游戏注册人数")
+    private Long miniGameRegisterUsers;
 
     /**
-     * 注册成本 (应用下载广告数据-激活成本)
+     * 小游戏注册成本
      */
-    @ApiModelProperty(value = "注册成本 (应用下载广告数据-激活成本)")
-    private BigDecimal activeCost;
+    @ApiModelProperty(value = "小游戏注册成本")
+    private BigDecimal miniGameRegisterCost;
 
     /**
-     * 首日转化数 (转化数据-转化数)
+     * 小游戏注册率
      */
-    @ApiModelProperty(value = "首日转化数 (转化数据-转化数)")
-    private Long firstConvertCount;
+    @ApiModelProperty(value = "小游戏注册率")
+    private BigDecimal miniGameRegisterRate;
 
     /**
-     * 首日转化成本 (转化数据-转化成本)
+     * 小游戏付费次数
      */
-    @ApiModelProperty(value = "首日转化成本 (转化数据-转化成本)")
-    private BigDecimal firstConvertCost;
+    @ApiModelProperty(value = "小游戏付费次数")
+    private Long miniGamePayingCount;
 
     /**
-     * 首次付费率 (应用下载广告数据-首次付费率)
+     * 小游戏付费金额
      */
-    @ApiModelProperty(value = "首次付费率 (应用下载广告数据-首次付费率)")
-    private BigDecimal firstActivePayRate;
+    @ApiModelProperty(value = "小游戏付费金额")
+    private BigDecimal miniGamePayingAmount;
 
     /**
-     * 首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)
+     * 小游戏首日付费人数
      */
-    @ApiModelProperty(value = "首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)")
-    private BigDecimal firstAttributionGameInAppLtv1day;
+    @ApiModelProperty(value = "小游戏首日付费人数")
+    private Long miniGamePayingUsersD1;
 
     /**
-     * 首日付费ROI (当日付费ROI)
+     * 小游戏首日付费金额
      */
-    @ApiModelProperty(value = "首日付费ROI (当日付费ROI)")
-    private BigDecimal firstAttributionGameInAppRoi1day;
+    @ApiModelProperty(value = "小游戏首日付费金额")
+    private BigDecimal miniGamePayingAmountD1;
 
     /**
-     * 付费次数 (应用下载广告数据-付费次数)
+     * 小游戏3日付费金额
      */
-    @ApiModelProperty(value = "付费次数 (应用下载广告数据-付费次数)")
-    private Long gamePayCount;
+    @ApiModelProperty(value = "小游戏3日付费金额")
+    private BigDecimal miniGamePayingAmountD3;
 
     /**
-     * 付费次数成本
+     * 小游戏7日付费金额
      */
-    @ApiModelProperty(value = "付费次数成本 = 消耗 / 付费次数")
-    private BigDecimal gamePayCountCost;
+    @ApiModelProperty(value = "小游戏7日付费金额")
+    private BigDecimal miniGamePayingAmountD7;
+
+    /**
+     * 小游戏14日付费金额
+     */
+    @ApiModelProperty(value = "小游戏14日付费金额")
+    private BigDecimal miniGamePayingAmountD14;
+
+    /**
+     * 小游戏30日付费金额
+     */
+    @ApiModelProperty(value = "小游戏30日付费金额")
+    private BigDecimal miniGamePayingAmountD30;
+
+    /**
+     * 小游戏首次付费人数
+     */
+    @ApiModelProperty(value = "小游戏首次付费人数")
+    private Long miniGameFirstPayingUsers;
+
+    /**
+     * 小游戏首日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏首日付费ROI")
+    private BigDecimal miniGameFirstDayPayingRoi;
+
+    /**
+     * 小游戏付费ROI
+     */
+    @ApiModelProperty(value = "小游戏付费ROI")
+    private BigDecimal miniGamePayingRoi;
+
+    /**
+     * 小游戏付费ARPU
+     */
+    @ApiModelProperty(value = "小游戏付费ARPU")
+    private BigDecimal miniGamePayingArpu;
+
+    /**
+     * 小游戏3日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏3日付费ROI")
+    private BigDecimal miniGamePayD3Roi;
+
+    /**
+     * 小游戏7日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏7日付费ROI")
+    private BigDecimal miniGamePayD7Roi;
+
+    /**
+     * 小游戏14日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏14日付费ROI")
+    private BigDecimal miniGamePayD14Roi;
+
+    /**
+     * 小游戏30日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏30日付费ROI")
+    private BigDecimal miniGamePayD30Roi;
+
+    /**
+     * 小游戏首日付费次数
+     */
+    @ApiModelProperty(value = "小游戏首日付费次数")
+    private Long minigame1dPayCount;
+
+    /**
+     * 小游戏首24小时付费人数
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费人数")
+    private Long minigame24hPayUv;
+
+    /**
+     * 小游戏首24小时付费金额
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费金额")
+    private BigDecimal minigame24hPayAmount;
+
+    /**
+     * 小游戏首24小时付费ROI
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费ROI")
+    private BigDecimal minigame24hPayRoi;
+
+    /**
+     * 小游戏首24小时付费ARPU
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费ARPU")
+    private BigDecimal minigame24hPayArpu;
 
     /**
      * ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）
@@ -871,6 +961,12 @@ public class TencentPromotionDayTotalVO {
     @ApiModelProperty(value = "ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）")
     private BigDecimal ltvDay1;
 
+    /**
+     * ltv1(实际数据) （首日新用户充值金额 / 注册人数）
+     */
+    @ApiModelProperty(value = "ltv1(实际数据) （首日新用户充值金额 / 注册人数）")
+    private BigDecimal ltvDay1ActualData;
+
     /**
      * 每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/TencentPromotionDayVO.java

@@ -986,60 +986,149 @@ public class TencentPromotionDayVO {
     @ApiModelProperty(value = "15日:ROI/付费/倍数")
     private PromotionRechargeTrendVO d15Trend;
 
+    /**
+     * 小游戏注册人数
+     */
+    @ApiModelProperty(value = "小游戏注册人数")
+    private Long miniGameRegisterUsers;
+
+    /**
+     * 小游戏注册成本
+     */
+    @ApiModelProperty(value = "小游戏注册成本")
+    private BigDecimal miniGameRegisterCost;
+
+    /**
+     * 小游戏注册率
+     */
+    @ApiModelProperty(value = "小游戏注册率")
+    private BigDecimal miniGameRegisterRate;
+
+    /**
+     * 小游戏付费次数
+     */
+    @ApiModelProperty(value = "小游戏付费次数")
+    private Long miniGamePayingCount;
+
+    /**
+     * 小游戏付费金额
+     */
+    @ApiModelProperty(value = "小游戏付费金额")
+    private BigDecimal miniGamePayingAmount;
+
+    /**
+     * 小游戏首日付费人数
+     */
+    @ApiModelProperty(value = "小游戏首日付费人数")
+    private Long miniGamePayingUsersD1;
+
+    /**
+     * 小游戏首日付费金额
+     */
+    @ApiModelProperty(value = "小游戏首日付费金额")
+    private BigDecimal miniGamePayingAmountD1;
+
+    /**
+     * 小游戏3日付费金额
+     */
+    @ApiModelProperty(value = "小游戏3日付费金额")
+    private BigDecimal miniGamePayingAmountD3;
 
     /**
-     * 注册人数 (应用下载广告数据-激活数)
+     * 小游戏7日付费金额
      */
-    @ApiModelProperty(value = "注册人数 (应用下载广告数据-激活数)")
-    private Long active;
+    @ApiModelProperty(value = "小游戏7日付费金额")
+    private BigDecimal miniGamePayingAmountD7;
 
     /**
-     * 注册成本 (应用下载广告数据-激活成本)
+     * 小游戏14日付费金额
      */
-    @ApiModelProperty(value = "注册成本 (应用下载广告数据-激活成本)")
-    private BigDecimal activeCost;
+    @ApiModelProperty(value = "小游戏14日付费金额")
+    private BigDecimal miniGamePayingAmountD14;
 
     /**
-     * 首日转化数 (转化数据-转化数)
+     * 小游戏30日付费金额
      */
-    @ApiModelProperty(value = "首日转化数 (转化数据-转化数)")
-    private Long firstConvertCount;
+    @ApiModelProperty(value = "小游戏30日付费金额")
+    private BigDecimal miniGamePayingAmountD30;
 
     /**
-     * 首日转化成本 (转化数据-转化成本)
+     * 小游戏首次付费人数
      */
-    @ApiModelProperty(value = "首日转化成本 (转化数据-转化成本)")
-    private BigDecimal firstConvertCost;
+    @ApiModelProperty(value = "小游戏首次付费人数")
+    private Long miniGameFirstPayingUsers;
 
     /**
-     * 首次付费率 (应用下载广告数据-首次付费率)
+     * 小游戏首日付费ROI
      */
-    @ApiModelProperty(value = "首次付费率 (应用下载广告数据-首次付费率)")
-    private BigDecimal firstActivePayRate;
+    @ApiModelProperty(value = "小游戏首日付费ROI")
+    private BigDecimal miniGameFirstDayPayingRoi;
 
     /**
-     * 首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)
+     * 小游戏付费ROI
      */
-    @ApiModelProperty(value = "首日付费金额(当日付费金额-所选时间范围内的激活用户，激活当日在APP内的付费金额)")
-    private BigDecimal firstAttributionGameInAppLtv1day;
+    @ApiModelProperty(value = "小游戏付费ROI")
+    private BigDecimal miniGamePayingRoi;
 
     /**
-     * 首日付费ROI (当日付费ROI)
+     * 小游戏付费ARPU
      */
-    @ApiModelProperty(value = "首日付费ROI (当日付费ROI)")
-    private BigDecimal firstAttributionGameInAppRoi1day;
+    @ApiModelProperty(value = "小游戏付费ARPU")
+    private BigDecimal miniGamePayingArpu;
 
     /**
-     * 付费次数 (应用下载广告数据-付费次数)
+     * 小游戏3日付费ROI
      */
-    @ApiModelProperty(value = "付费次数 (应用下载广告数据-付费次数)")
-    private Long gamePayCount;
+    @ApiModelProperty(value = "小游戏3日付费ROI")
+    private BigDecimal miniGamePayD3Roi;
 
     /**
-     * 付费次数成本
+     * 小游戏7日付费ROI
      */
-    @ApiModelProperty(value = "付费次数成本 = 消耗 / 付费次数")
-    private BigDecimal gamePayCountCost;
+    @ApiModelProperty(value = "小游戏7日付费ROI")
+    private BigDecimal miniGamePayD7Roi;
+
+    /**
+     * 小游戏14日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏14日付费ROI")
+    private BigDecimal miniGamePayD14Roi;
+
+    /**
+     * 小游戏30日付费ROI
+     */
+    @ApiModelProperty(value = "小游戏30日付费ROI")
+    private BigDecimal miniGamePayD30Roi;
+
+    /**
+     * 小游戏首日付费次数
+     */
+    @ApiModelProperty(value = "小游戏首日付费次数")
+    private Long minigame1dPayCount;
+
+    /**
+     * 小游戏首24小时付费人数
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费人数")
+    private Long minigame24hPayUv;
+
+    /**
+     * 小游戏首24小时付费金额
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费金额")
+    private BigDecimal minigame24hPayAmount;
+
+    /**
+     * 小游戏首24小时付费ROI
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费ROI")
+    private BigDecimal minigame24hPayRoi;
+
+    /**
+     * 小游戏首24小时付费ARPU
+     */
+    @ApiModelProperty(value = "小游戏首24小时付费ARPU")
+    private BigDecimal minigame24hPayArpu;
 
     /**
      * ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）
@@ -1047,6 +1136,12 @@ public class TencentPromotionDayVO {
     @ApiModelProperty(value = "ltv1 （首日付费金额（attribution_game_in_app_ltv1day） / 注册人数）")
     private BigDecimal ltvDay1;
 
+    /**
+     * ltv1(实际数据) （首日新用户充值金额 / 注册人数）
+     */
+    @ApiModelProperty(value = "ltv1(实际数据) （首日新用户充值金额 / 注册人数）")
+    private BigDecimal ltvDay1ActualData;
+
     /**
      * 每日扣单数 （广告首日总订单数 - 应用下载广告数据-付费次数（game_pay_count））
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/PromotionDayServiceImpl.java

@@ -1015,6 +1015,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     game_pay_count,
                     ROUND(IF(game_pay_count > 0, today_cost / game_pay_count, 0), 2) as game_pay_count_cost,
                     ltv_day1,
+                    ROUND(IF(reg_num > 0, first_new_user_amount / reg_num, 0), 2) as ltv_day1_actual_data,
                     sub_order_num,
                     sub_order_amount,
                     ROUND(IF(first_new_user_amount_count > 0, today_cost / first_new_user_amount_count, 0), 2) as first_new_user_amount_count_cost,
@@ -1123,6 +1124,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	    SUM(game_pay_count) as game_pay_count,
                 	    ROUND(IF(SUM(game_pay_count) > 0, SUM(today_cost) / SUM(game_pay_count), 0), 2) as game_pay_count_cost,
                 	    ROUND(IF(SUM(reg_num) > 0, SUM(first_attribution_game_in_app_ltv1day) / SUM(reg_num), 0), 2) as ltv_day1,
+                	    ROUND(IF(SUM(reg_num) > 0, SUM(first_new_user_amount) / SUM(reg_num), 0), 2) as ltv_day1_actual_data,
                 	    (SUM(first_new_user_amount_count) - SUM(first_sub_amount_count)) as sub_order_num,
                 	    (SUM(first_new_user_amount) - SUM(first_sub_amount)) as sub_order_amount,
                 	    ROUND(IF(SUM(first_new_user_amount_count) > 0, SUM(today_cost) / SUM(first_new_user_amount_count), 0), 2) as first_new_user_amount_count_cost,
@@ -1250,6 +1252,7 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     SUM(game_pay_count) as game_pay_count,
                     ROUND(IF(SUM(game_pay_count) > 0, SUM(today_cost) / SUM(game_pay_count), 0), 2) as game_pay_count_cost,
                     ROUND(IF(SUM(reg_num) > 0, SUM(first_attribution_game_in_app_ltv1day) / SUM(reg_num), 0), 2) as ltv_day1,
+                    ROUND(IF(SUM(reg_num) > 0, SUM(first_new_user_amount) / SUM(reg_num), 0), 2) as ltv_day1_actual_data,
                     (SUM(first_new_user_amount_count) - SUM(first_sub_amount_count)) as sub_order_num,
                     (SUM(first_new_user_amount) - SUM(first_sub_amount)) as sub_order_amount,
                     ROUND(IF(SUM(first_new_user_amount_count) > 0, SUM(today_cost) / SUM(first_new_user_amount_count), 0), 2) as first_new_user_amount_count_cost,
@@ -1403,16 +1406,32 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	d3,
                 	d7,
                 	d15,
-                	active,
-                    active_cost,
-                    first_convert_count,
-                    first_convert_cost,
-                    first_active_pay_rate,
-                    first_attribution_game_in_app_ltv1day,
-                    first_attribution_game_in_app_roi1day,
-                    game_pay_count,
-                    ROUND(IF(game_pay_count > 0, today_cost / game_pay_count, 0), 2) as game_pay_count_cost,
+                	mini_game_register_users,
+                    mini_game_register_cost,
+                    mini_game_register_rate,
+                    mini_game_paying_count,
+                    mini_game_paying_amount,
+                    mini_game_paying_users_d1,
+                    mini_game_paying_amount_d1,
+                    mini_game_paying_amount_d3,
+                    mini_game_paying_amount_d7,
+                    mini_game_paying_amount_d14,
+                    mini_game_paying_amount_d30,
+                    mini_game_first_paying_users,
+                    mini_game_first_day_paying_roi,
+                    mini_game_paying_roi,
+                    mini_game_paying_arpu,
+                    mini_game_pay_d3_roi,
+                    mini_game_pay_d7_roi,
+                    mini_game_pay_d14_roi,
+                    mini_game_pay_d30_roi,
+                    minigame1d_pay_count,
+                    minigame24h_pay_uv,
+                    minigame24h_pay_amount,
+                    minigame24h_pay_roi,
+                    minigame24h_pay_arpu,
                     ltv_day1,
+                    ROUND(IF(reg_num > 0, first_new_user_amount / reg_num, 0), 2) as ltv_day1_actual_data,
                     sub_order_num,
                     sub_order_amount,
                     ROUND(IF(first_new_user_amount_count > 0, today_cost / first_new_user_amount_count, 0), 2) as first_new_user_amount_count_cost,
@@ -1506,21 +1525,37 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 		round(if(SUM(reg_num) > 0, SUM(first_new_user_amount_num) / SUM(reg_num), 0), 4) as first_amount_rate,
                 		round(if(SUM(first_new_user_amount_count) > 0, SUM(first_new_user_amount) / SUM(first_new_user_amount_count), 0), 2) as first_new_user_avg_price,
                 		round(if(SUM(new_user_total_amount_count) > 0, SUM(new_user_total_amount) / SUM(new_user_total_amount_count), 0), 2) as new_user_total_avg_price,
-                		SUM(d1) as d1,
-                		SUM(d2) as d2,
-                		SUM(d3) as d3,
-                		SUM(d7) as d7,
-                		SUM(d15) as d15,
-                		IFNULL(SUM(active), 0) as active,
-                	    ROUND(IF(SUM(active) > 0, SUM(today_cost) / SUM(active), 0), 2) as active_cost,
-                	    IFNULL(SUM(first_convert_count), 0) as first_convert_count,
-                	    ROUND(IF(SUM(first_convert_count) > 0, SUM(today_cost) / SUM(first_convert_count), 0), 2) as first_convert_cost,
-                	    ROUND(IF(SUM(active) > 0, SUM(game_pay_count) / SUM(active), 0), 4) as first_active_pay_rate,
-                	    SUM(first_attribution_game_in_app_ltv1day) as first_attribution_game_in_app_ltv1day,
-                	    ROUND(IF(SUM(today_cost) > 0 , SUM(first_attribution_game_in_app_ltv1day) / SUM(today_cost), 0), 4) as first_attribution_game_in_app_roi1day,
-                	    SUM(game_pay_count) as game_pay_count,
-                	    ROUND(IF(SUM(game_pay_count) > 0, SUM(today_cost) / SUM(game_pay_count), 0), 2) as game_pay_count_cost,
-                	    ROUND(IF(SUM(reg_num) > 0, SUM(first_attribution_game_in_app_ltv1day) / SUM(reg_num), 0), 2) as ltv_day1,
+                		IFNULL(SUM(d1), 0) as d1,
+                		IFNULL(SUM(d2), 0) as d2,
+                		IFNULL(SUM(d3), 0) as d3,
+                		IFNULL(SUM(d7), 0) as d7,
+                		IFNULL(SUM(d15), 0) as d15,
+                		IFNULL(SUM(mini_game_register_users), 0) as mini_game_register_users,
+                        ROUND(IF(SUM(mini_game_register_users) > 0 , SUM(today_cost) / SUM(mini_game_register_users), 0), 2) as mini_game_register_cost,
+                        ROUND(IF(SUM(click_count) > 0 , SUM(mini_game_register_users) / SUM(click_count), 0), 4) as mini_game_register_rate,
+                        IFNULL(SUM(mini_game_paying_count), 0) as mini_game_paying_count,
+                        IFNULL(SUM(mini_game_paying_amount), 0) as mini_game_paying_amount,
+                        IFNULL(SUM(mini_game_paying_users_d1), 0) as mini_game_paying_users_d1,
+                        IFNULL(SUM(mini_game_paying_amount_d1), 0) as mini_game_paying_amount_d1,
+                        IFNULL(SUM(mini_game_paying_amount_d3), 0) as mini_game_paying_amount_d3,
+                        IFNULL(SUM(mini_game_paying_amount_d7), 0) as mini_game_paying_amount_d7,
+                        IFNULL(SUM(mini_game_paying_amount_d14), 0) as mini_game_paying_amount_d14,
+                        IFNULL(SUM(mini_game_paying_amount_d30), 0) as mini_game_paying_amount_d30,
+                        IFNULL(SUM(mini_game_first_paying_users), 0) as mini_game_first_paying_users,
+                        ROUND(IF(SUM(today_cost) > 0 , SUM(mini_game_paying_amount) / SUM(today_cost), 0), 4) as mini_game_paying_roi,
+                        ROUND(IF(SUM(mini_game_register_users) > 0 , SUM(mini_game_paying_amount) / SUM(mini_game_register_users), 0), 2) as mini_game_paying_arpu,
+                        ROUND(IF(SUM(today_cost) > 0 , SUM(mini_game_paying_amount_d1) / SUM(today_cost), 0), 4) as mini_game_first_day_paying_roi,
+                        ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 2 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d3) / SUM(IF(DATE_ADD(dt, INTERVAL 2 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d3_roi,
+                        ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 6 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d7) / SUM(IF(DATE_ADD(dt, INTERVAL 6 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d7_roi,
+                        ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 13 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d14) / SUM(IF(DATE_ADD(dt, INTERVAL 13 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d14_roi,
+                        ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d30) / SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d30_roi,
+                        IFNULL(SUM(minigame1d_pay_count), 0) as minigame1d_pay_count,
+                        IFNULL(SUM(minigame24h_pay_uv), 0) as minigame24h_pay_uv,
+                        IFNULL(SUM(minigame24h_pay_amount), 0) as minigame24h_pay_amount,
+                        ROUND(IF(SUM(today_cost) > 0 , SUM(minigame24h_pay_amount) / SUM(today_cost), 0), 4) as minigame24h_pay_roi,
+                        ROUND(IF(SUM(minigame24h_pay_uv) > 0 , SUM(minigame24h_pay_amount) / SUM(minigame24h_pay_uv), 0), 2) as minigame24h_pay_arpu,
+                	    ROUND(IF(SUM(reg_num) > 0, SUM(mini_game_paying_amount_d1) / SUM(reg_num), 0), 2) as ltv_day1,
+                	    ROUND(IF(SUM(reg_num) > 0, SUM(first_new_user_amount) / SUM(reg_num), 0), 2) as ltv_day1_actual_data,
                 	    (SUM(first_new_user_amount_count) - SUM(first_sub_amount_count)) as sub_order_num,
                 	    (SUM(first_new_user_amount) - SUM(first_sub_amount)) as sub_order_amount,
                 	    ROUND(IF(SUM(first_new_user_amount_count) > 0, SUM(today_cost) / SUM(first_new_user_amount_count), 0), 2) as first_new_user_amount_count_cost,
@@ -1638,16 +1673,32 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	IFNULL(SUM(d3), 0) as d3,
                 	IFNULL(SUM(d7), 0) as d7,
                 	IFNULL(SUM(d15), 0) as d15,
-                	IFNULL(SUM(active), 0) as active,
-                    ROUND(IF(SUM(active) > 0, SUM(today_cost) / SUM(active), 0), 2) as active_cost,
-                    IFNULL(SUM(first_convert_count), 0) as first_convert_count,
-                    ROUND(IF(SUM(first_convert_count) > 0, SUM(today_cost) / SUM(first_convert_count), 0), 2) as first_convert_cost,
-                    ROUND(IF(SUM(active) > 0, SUM(game_pay_count) / SUM(active), 0), 4) as first_active_pay_rate,
-                    SUM(first_attribution_game_in_app_ltv1day) as first_attribution_game_in_app_ltv1day,
-                    ROUND(IF(SUM(today_cost) > 0 , SUM(first_attribution_game_in_app_ltv1day) / SUM(today_cost), 0), 4) as first_attribution_game_in_app_roi1day,
-                    SUM(game_pay_count) as game_pay_count,
-                    ROUND(IF(SUM(game_pay_count) > 0, SUM(today_cost) / SUM(game_pay_count), 0), 2) as game_pay_count_cost,
-                    ROUND(IF(SUM(reg_num) > 0, SUM(first_attribution_game_in_app_ltv1day) / SUM(reg_num), 0), 2) as ltv_day1,
+                	IFNULL(SUM(mini_game_register_users), 0) as mini_game_register_users,
+                    ROUND(IF(SUM(mini_game_register_users) > 0 , SUM(today_cost) / SUM(mini_game_register_users), 0), 2) as mini_game_register_cost,
+                    ROUND(IF(SUM(click_count) > 0 , SUM(mini_game_register_users) / SUM(click_count), 0), 4) as mini_game_register_rate,
+                    IFNULL(SUM(mini_game_paying_count), 0) as mini_game_paying_count,
+                    IFNULL(SUM(mini_game_paying_amount), 0) as mini_game_paying_amount,
+                    IFNULL(SUM(mini_game_paying_users_d1), 0) as mini_game_paying_users_d1,
+                    IFNULL(SUM(mini_game_paying_amount_d1), 0) as mini_game_paying_amount_d1,
+                    IFNULL(SUM(mini_game_paying_amount_d3), 0) as mini_game_paying_amount_d3,
+                    IFNULL(SUM(mini_game_paying_amount_d7), 0) as mini_game_paying_amount_d7,
+                    IFNULL(SUM(mini_game_paying_amount_d14), 0) as mini_game_paying_amount_d14,
+                    IFNULL(SUM(mini_game_paying_amount_d30), 0) as mini_game_paying_amount_d30,
+                    IFNULL(SUM(mini_game_first_paying_users), 0) as mini_game_first_paying_users,
+                    ROUND(IF(SUM(today_cost) > 0 , SUM(mini_game_paying_amount) / SUM(today_cost), 0), 4) as mini_game_paying_roi,
+                    ROUND(IF(SUM(mini_game_register_users) > 0 , SUM(mini_game_paying_amount) / SUM(mini_game_register_users), 0), 2) as mini_game_paying_arpu,
+                    ROUND(IF(SUM(today_cost) > 0 , SUM(mini_game_paying_amount_d1) / SUM(today_cost), 0), 4) as mini_game_first_day_paying_roi,
+                    ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 2 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d3) / SUM(IF(DATE_ADD(dt, INTERVAL 2 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d3_roi,
+                    ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 6 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d7) / SUM(IF(DATE_ADD(dt, INTERVAL 6 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d7_roi,
+                    ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 13 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d14) / SUM(IF(DATE_ADD(dt, INTERVAL 13 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d14_roi,
+                    ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= DATE(NOW()), today_cost, 0)) > 0 , SUM(mini_game_paying_amount_d30) / SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= DATE(NOW()), today_cost, 0)), 0), 4) as mini_game_pay_d30_roi,
+                    IFNULL(SUM(minigame1d_pay_count), 0) as minigame1d_pay_count,
+                    IFNULL(SUM(minigame24h_pay_uv), 0) as minigame24h_pay_uv,
+                    IFNULL(SUM(minigame24h_pay_amount), 0) as minigame24h_pay_amount,
+                    ROUND(IF(SUM(today_cost) > 0 , SUM(minigame24h_pay_amount) / SUM(today_cost), 0), 4) as minigame24h_pay_roi,
+                    ROUND(IF(SUM(minigame24h_pay_uv) > 0 , SUM(minigame24h_pay_amount) / SUM(minigame24h_pay_uv), 0), 2) as minigame24h_pay_arpu,
+                    ROUND(IF(SUM(reg_num) > 0, SUM(mini_game_paying_amount_d1) / SUM(reg_num), 0), 2) as ltv_day1,
+                    ROUND(IF(SUM(reg_num) > 0, SUM(first_new_user_amount) / SUM(reg_num), 0), 2) as ltv_day1_actual_data,
                     (SUM(first_new_user_amount_count) - SUM(first_sub_amount_count)) as sub_order_num,
                     (SUM(first_new_user_amount) - SUM(first_sub_amount)) as sub_order_amount,
                     ROUND(IF(SUM(first_new_user_amount_count) > 0, SUM(today_cost) / SUM(first_new_user_amount_count), 0), 2) as first_new_user_amount_count_cost,