Merge remote-tracking branch 'origin/package' into package

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

@@ -7748,7 +7748,10 @@ public class GameDataServiceImpl implements IGameDataService {
         for (FlowMonitorVO record : records) {
             amountCount += record.getTwentyfourAmount();
         }
+        //把amountCount的小数点后保留四位
+        amountCount = new BigDecimal(amountCount).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
         vo.setAmountCount(amountCount);
+
         //取出总消耗
         Double costCount = records.get(0).getCostCount();
         vo.setCostCount(costCount);

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

@@ -1650,7 +1650,7 @@ 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,
-                        IFNULL(SUM(mini_game_register_cost), 0) as mini_game_register_cost,
+                        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,
@@ -1793,7 +1793,7 @@ 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,
-                    IFNULL(SUM(mini_game_register_cost), 0) as mini_game_register_cost,
+                    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,