Merge branch 'package' of GameCenter/game-center into dev

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

@@ -101,10 +101,10 @@ public class AdsRoleAmountRateParentServiceImpl extends ServiceImpl<AdsRoleAmoun
 
     private void daySplit(StringBuilder totalDayN, String dayN) {
         totalDayN.append(" CONCAT_WS('/', ")
-                .append("SUM(SPLIT_PART(").append(dayN).append(", '/', 1)), ")
-                .append("SUM(SPLIT_PART(").append(dayN).append(", '/', 2)), ")
-                .append("SUM(SPLIT_PART(").append(dayN).append(", '/', 3)), ")
-                .append("SUM(SPLIT_PART(").append(dayN).append(", '/', 4)), ")
+                .append("IFNULL(SUM(SPLIT_PART(").append(dayN).append(", '/', 1)), 0), ")
+                .append("IFNULL(SUM(SPLIT_PART(").append(dayN).append(", '/', 2)), 0), ")
+                .append("IFNULL(SUM(SPLIT_PART(").append(dayN).append(", '/', 3)), 0), ")
+                .append("IFNULL(SUM(SPLIT_PART(").append(dayN).append(", '/', 4)), 0), ")
                 .append("ROUND(IF(SUM(SPLIT_PART(").append(dayN).append(", '/', 1)) > 0, ")
                 .append("SUM(SPLIT_PART(").append(dayN).append(", '/', 2)) / SUM(SPLIT_PART(").append(dayN).append(", '/', 1)), 0), 4), ")
                 .append("ROUND(IF(SUM(role_num) > 0, SUM(SPLIT_PART(").append(dayN).append(", '/', 1)) / SUM(role_num), 0), 4), ")