修改内容：腾讯广告监控计算方式修改

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/GameDataController.java

@@ -105,14 +105,14 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏首日复充")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgain")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgain")
     @PostMapping("/firstNewUser/again")
     public ResultVO<Page<GameDataFirstNewUserAgainVO>> getFirstNewUserAgain(@RequestBody GameDataFirstNewUserAgainDTO dto) {
         return ResultVO.ok(gameDataService.getFirstNewUserAgain(dto));
     }
 
     @ApiOperation(value = "游戏首日复充总计")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgainTotal")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:firstNewUserAgainTotal")
     @PostMapping("/firstNewUser/again/total")
     public ResultVO<GameDataFirstNewUserAgainTotalVO> getFirstNewUserAgainTotal(@RequestBody GameDataFirstNewUserAgainTotalDTO dto) {
         return ResultVO.ok(gameDataService.getFirstNewUserAgainTotal(dto));

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

@@ -1531,8 +1531,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 		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_register_cost), 0) as mini_game_register_cost,
+                        IFNULL(SUM(mini_game_register_rate), 0) 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,
@@ -1542,18 +1542,18 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                         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(mini_game_paying_roi), 0) as mini_game_paying_roi,
+                        IFNULL(SUM(mini_game_paying_arpu), 0) as mini_game_paying_arpu,
+                        IFNULL(SUM(mini_game_first_day_paying_roi), 0) as mini_game_first_day_paying_roi,
+                        IFNULL(SUM(mini_game_pay_d3_roi), 0) as mini_game_pay_d3_roi,
+                        IFNULL(SUM(mini_game_pay_d7_roi), 0) as mini_game_pay_d7_roi,
+                        IFNULL(SUM(mini_game_pay_d14_roi), 0) as mini_game_pay_d14_roi,
+                        IFNULL(SUM(mini_game_pay_d30_roi), 0) 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,
+                        IFNULL(SUM(minigame24h_pay_roi), 0) as minigame24h_pay_roi,
+                        IFNULL(SUM(minigame24h_pay_arpu), 0) 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,
@@ -1674,8 +1674,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	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_register_cost), 0) as mini_game_register_cost,
+                    IFNULL(SUM(mini_game_register_rate), 0) 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,
@@ -1685,18 +1685,18 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     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(mini_game_paying_roi), 0) as mini_game_paying_roi,
+                    IFNULL(SUM(mini_game_paying_arpu), 0) as mini_game_paying_arpu,
+                    IFNULL(SUM(mini_game_first_day_paying_roi), 0) as mini_game_first_day_paying_roi,
+                    IFNULL(SUM(mini_game_pay_d3_roi), 0) as mini_game_pay_d3_roi,
+                    IFNULL(SUM(mini_game_pay_d7_roi), 0) as mini_game_pay_d7_roi,
+                    IFNULL(SUM(mini_game_pay_d14_roi), 0) as mini_game_pay_d14_roi,
+                    IFNULL(SUM(mini_game_pay_d30_roi), 0) 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,
+                    IFNULL(SUM(minigame24h_pay_roi), 0) as minigame24h_pay_roi,
+                    IFNULL(SUM(minigame24h_pay_arpu), 0) 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,