修改内容：游戏首日复充加到d90

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * @author tianhua
@@ -383,23 +382,133 @@ public class GameDataFirstNewUserAgainTotalVO {
     @ApiModelProperty(value = "不展示")
     private String da29;
 
-    /**
-     * 首日注册且充值用户复充趋势在第30天：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
     private String da30;
+    @ApiModelProperty(value = "不展示")
+    private String da31;
+    @ApiModelProperty(value = "不展示")
+    private String da32;
+    @ApiModelProperty(value = "不展示")
+    private String da33;
+    @ApiModelProperty(value = "不展示")
+    private String da34;
+    @ApiModelProperty(value = "不展示")
+    private String da35;
+    @ApiModelProperty(value = "不展示")
+    private String da36;
+    @ApiModelProperty(value = "不展示")
+    private String da37;
+    @ApiModelProperty(value = "不展示")
+    private String da38;
+    @ApiModelProperty(value = "不展示")
+    private String da39;
 
-    /**
-     * 首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
-    private String m2;
+    private String da40;
+    @ApiModelProperty(value = "不展示")
+    private String da41;
+    @ApiModelProperty(value = "不展示")
+    private String da42;
+    @ApiModelProperty(value = "不展示")
+    private String da43;
+    @ApiModelProperty(value = "不展示")
+    private String da44;
+    @ApiModelProperty(value = "不展示")
+    private String da45;
+    @ApiModelProperty(value = "不展示")
+    private String da46;
+    @ApiModelProperty(value = "不展示")
+    private String da47;
+    @ApiModelProperty(value = "不展示")
+    private String da48;
+    @ApiModelProperty(value = "不展示")
+    private String da49;
 
-    /**
-     * 首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
-    private String m3;
+    private String da50;
+    @ApiModelProperty(value = "不展示")
+    private String da51;
+    @ApiModelProperty(value = "不展示")
+    private String da52;
+    @ApiModelProperty(value = "不展示")
+    private String da53;
+    @ApiModelProperty(value = "不展示")
+    private String da54;
+    @ApiModelProperty(value = "不展示")
+    private String da55;
+    @ApiModelProperty(value = "不展示")
+    private String da56;
+    @ApiModelProperty(value = "不展示")
+    private String da57;
+    @ApiModelProperty(value = "不展示")
+    private String da58;
+    @ApiModelProperty(value = "不展示")
+    private String da59;
+
+    @ApiModelProperty(value = "不展示")
+    private String da60;
+    @ApiModelProperty(value = "不展示")
+    private String da61;
+    @ApiModelProperty(value = "不展示")
+    private String da62;
+    @ApiModelProperty(value = "不展示")
+    private String da63;
+    @ApiModelProperty(value = "不展示")
+    private String da64;
+    @ApiModelProperty(value = "不展示")
+    private String da65;
+    @ApiModelProperty(value = "不展示")
+    private String da66;
+    @ApiModelProperty(value = "不展示")
+    private String da67;
+    @ApiModelProperty(value = "不展示")
+    private String da68;
+    @ApiModelProperty(value = "不展示")
+    private String da69;
+
+    @ApiModelProperty(value = "不展示")
+    private String da70;
+    @ApiModelProperty(value = "不展示")
+    private String da71;
+    @ApiModelProperty(value = "不展示")
+    private String da72;
+    @ApiModelProperty(value = "不展示")
+    private String da73;
+    @ApiModelProperty(value = "不展示")
+    private String da74;
+    @ApiModelProperty(value = "不展示")
+    private String da75;
+    @ApiModelProperty(value = "不展示")
+    private String da76;
+    @ApiModelProperty(value = "不展示")
+    private String da77;
+    @ApiModelProperty(value = "不展示")
+    private String da78;
+    @ApiModelProperty(value = "不展示")
+    private String da79;
+
+    @ApiModelProperty(value = "不展示")
+    private String da80;
+    @ApiModelProperty(value = "不展示")
+    private String da81;
+    @ApiModelProperty(value = "不展示")
+    private String da82;
+    @ApiModelProperty(value = "不展示")
+    private String da83;
+    @ApiModelProperty(value = "不展示")
+    private String da84;
+    @ApiModelProperty(value = "不展示")
+    private String da85;
+    @ApiModelProperty(value = "不展示")
+    private String da86;
+    @ApiModelProperty(value = "不展示")
+    private String da87;
+    @ApiModelProperty(value = "不展示")
+    private String da88;
+    @ApiModelProperty(value = "不展示")
+    private String da89;
+    @ApiModelProperty(value = "不展示")
+    private String da90;
 
     /**
      * 首日注册且充值用户复充趋势在第4月：充值金额,充值人数,充值占比
@@ -453,7 +562,7 @@ public class GameDataFirstNewUserAgainTotalVO {
      * 首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比
      */
     @ApiModelProperty(value = "不展示")
-    private String y1;
+    private String m12;
 
     /**
      * 首日注册且充值的用户至今：充值金额,充值人数,充值占比
@@ -642,16 +751,364 @@ public class GameDataFirstNewUserAgainTotalVO {
     private FirstNewUserAgainTrendVO da30Trend;
 
     /**
-     * 首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比
+     * 首日注册且充值用户复充趋势第31天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势第31天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da31Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第32天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第32天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da32Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第33天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第33天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da33Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第34天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第34天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da34Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第35天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第35天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da35Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第36天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第36天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da36Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第37天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第37天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da37Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第38天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第38天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da38Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第39天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第39天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da39Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第40天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第40天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da40Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第41天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第41天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da41Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第42天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第42天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da42Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第43天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第43天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da43Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第44天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第44天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da44Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第45天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第45天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da45Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第46天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第46天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da46Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第47天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第47天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da47Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第48天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第48天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da48Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第49天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在49天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da49Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第50天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第50天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da50Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第51天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第51天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da51Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第52天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第52天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da52Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第53天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第53天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da53Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第54天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第54天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da54Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第55天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第55天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da55Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第56天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第56天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da56Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第57天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第57天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da57Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第58天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第58天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da58Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第59天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第59天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da59Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第60天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第60天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da60Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势第61天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势第61天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da61Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第62天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第62天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da62Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第63天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第63天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da63Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第64天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第64天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da64Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第65天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第65天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da65Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第66天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第66天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da66Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第67天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第67天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da67Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第68天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第68天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da68Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第69天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第69天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da69Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第70天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第70天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da70Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第71天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第71天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da71Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第72天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第72天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da72Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第73天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第73天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da73Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第74天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第74天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da74Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第75天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第75天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da75Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第76天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第76天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da76Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第77天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第77天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da77Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第78天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第78天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da78Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第79天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在79天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da79Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第80天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第80天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da80Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第81天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第81天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da81Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第82天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第82天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da82Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第83天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第83天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da83Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第84天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第84天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da84Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第85天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第85天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da85Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第86天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第86天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da86Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第87天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第87天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da87Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第88天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第88天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da88Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第89天：充值金额,充值人数,充值占比
      */
-    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO m2Trend;
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第89天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da89Trend;
 
     /**
-     * 首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比
+     * 首日注册且充值用户复充趋势在第90天：充值金额,充值人数,充值占比
      */
-    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO m3Trend;
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第90天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da90Trend;
 
     /**
      * 首日注册且充值用户复充趋势在第4月：充值金额,充值人数,充值占比
@@ -705,7 +1162,7 @@ public class GameDataFirstNewUserAgainTotalVO {
      * 首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比
      */
     @ApiModelProperty(value = "首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO y1Trend;
+    private FirstNewUserAgainTrendVO m12Trend;
 
     /**
      * 首日注册且充值的用户至今：充值金额,充值人数,充值占比

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

@@ -413,23 +413,133 @@ public class GameDataFirstNewUserAgainVO {
     @ApiModelProperty(value = "不展示")
     private String da29;
 
-    /**
-     * 首日注册且充值用户复充趋势在第30天：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
     private String da30;
+    @ApiModelProperty(value = "不展示")
+    private String da31;
+    @ApiModelProperty(value = "不展示")
+    private String da32;
+    @ApiModelProperty(value = "不展示")
+    private String da33;
+    @ApiModelProperty(value = "不展示")
+    private String da34;
+    @ApiModelProperty(value = "不展示")
+    private String da35;
+    @ApiModelProperty(value = "不展示")
+    private String da36;
+    @ApiModelProperty(value = "不展示")
+    private String da37;
+    @ApiModelProperty(value = "不展示")
+    private String da38;
+    @ApiModelProperty(value = "不展示")
+    private String da39;
 
-    /**
-     * 首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
-    private String m2;
+    private String da40;
+    @ApiModelProperty(value = "不展示")
+    private String da41;
+    @ApiModelProperty(value = "不展示")
+    private String da42;
+    @ApiModelProperty(value = "不展示")
+    private String da43;
+    @ApiModelProperty(value = "不展示")
+    private String da44;
+    @ApiModelProperty(value = "不展示")
+    private String da45;
+    @ApiModelProperty(value = "不展示")
+    private String da46;
+    @ApiModelProperty(value = "不展示")
+    private String da47;
+    @ApiModelProperty(value = "不展示")
+    private String da48;
+    @ApiModelProperty(value = "不展示")
+    private String da49;
 
-    /**
-     * 首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比
-     */
     @ApiModelProperty(value = "不展示")
-    private String m3;
+    private String da50;
+    @ApiModelProperty(value = "不展示")
+    private String da51;
+    @ApiModelProperty(value = "不展示")
+    private String da52;
+    @ApiModelProperty(value = "不展示")
+    private String da53;
+    @ApiModelProperty(value = "不展示")
+    private String da54;
+    @ApiModelProperty(value = "不展示")
+    private String da55;
+    @ApiModelProperty(value = "不展示")
+    private String da56;
+    @ApiModelProperty(value = "不展示")
+    private String da57;
+    @ApiModelProperty(value = "不展示")
+    private String da58;
+    @ApiModelProperty(value = "不展示")
+    private String da59;
+
+    @ApiModelProperty(value = "不展示")
+    private String da60;
+    @ApiModelProperty(value = "不展示")
+    private String da61;
+    @ApiModelProperty(value = "不展示")
+    private String da62;
+    @ApiModelProperty(value = "不展示")
+    private String da63;
+    @ApiModelProperty(value = "不展示")
+    private String da64;
+    @ApiModelProperty(value = "不展示")
+    private String da65;
+    @ApiModelProperty(value = "不展示")
+    private String da66;
+    @ApiModelProperty(value = "不展示")
+    private String da67;
+    @ApiModelProperty(value = "不展示")
+    private String da68;
+    @ApiModelProperty(value = "不展示")
+    private String da69;
+
+    @ApiModelProperty(value = "不展示")
+    private String da70;
+    @ApiModelProperty(value = "不展示")
+    private String da71;
+    @ApiModelProperty(value = "不展示")
+    private String da72;
+    @ApiModelProperty(value = "不展示")
+    private String da73;
+    @ApiModelProperty(value = "不展示")
+    private String da74;
+    @ApiModelProperty(value = "不展示")
+    private String da75;
+    @ApiModelProperty(value = "不展示")
+    private String da76;
+    @ApiModelProperty(value = "不展示")
+    private String da77;
+    @ApiModelProperty(value = "不展示")
+    private String da78;
+    @ApiModelProperty(value = "不展示")
+    private String da79;
+
+    @ApiModelProperty(value = "不展示")
+    private String da80;
+    @ApiModelProperty(value = "不展示")
+    private String da81;
+    @ApiModelProperty(value = "不展示")
+    private String da82;
+    @ApiModelProperty(value = "不展示")
+    private String da83;
+    @ApiModelProperty(value = "不展示")
+    private String da84;
+    @ApiModelProperty(value = "不展示")
+    private String da85;
+    @ApiModelProperty(value = "不展示")
+    private String da86;
+    @ApiModelProperty(value = "不展示")
+    private String da87;
+    @ApiModelProperty(value = "不展示")
+    private String da88;
+    @ApiModelProperty(value = "不展示")
+    private String da89;
+    @ApiModelProperty(value = "不展示")
+    private String da90;
 
     /**
      * 首日注册且充值用户复充趋势在第4月：充值金额,充值人数,充值占比
@@ -483,7 +593,7 @@ public class GameDataFirstNewUserAgainVO {
      * 首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比
      */
     @ApiModelProperty(value = "不展示")
-    private String y1;
+    private String m12;
 
     /**
      * 首日注册且充值的用户至今：充值金额,充值人数,充值占比
@@ -672,16 +782,364 @@ public class GameDataFirstNewUserAgainVO {
     private FirstNewUserAgainTrendVO da30Trend;
 
     /**
-     * 首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比
+     * 首日注册且充值用户复充趋势第31天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势第31天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da31Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第32天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第32天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da32Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第33天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第33天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da33Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第34天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第34天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da34Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第35天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第35天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da35Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第36天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第36天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da36Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第37天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第37天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da37Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第38天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第38天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da38Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第39天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第39天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da39Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第40天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第40天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da40Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第41天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第41天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da41Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第42天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第42天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da42Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第43天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第43天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da43Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第44天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第44天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da44Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第45天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第45天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da45Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第46天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第46天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da46Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第47天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第47天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da47Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第48天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第48天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da48Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第49天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在49天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da49Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第50天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第50天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da50Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第51天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第51天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da51Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第52天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第52天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da52Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第53天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第53天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da53Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第54天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第54天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da54Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第55天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第55天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da55Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第56天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第56天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da56Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第57天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第57天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da57Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第58天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第58天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da58Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第59天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第59天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da59Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第60天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第60天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da60Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势第61天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势第61天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da61Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第62天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第62天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da62Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第63天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第63天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da63Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第64天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第64天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da64Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第65天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第65天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da65Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第66天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第66天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da66Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第67天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第67天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da67Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第68天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第68天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da68Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第69天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第69天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da69Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第70天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第70天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da70Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第71天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第71天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da71Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第72天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第72天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da72Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第73天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第73天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da73Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第74天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第74天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da74Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第75天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第75天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da75Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第76天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第76天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da76Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第77天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第77天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da77Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第78天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第78天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da78Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第79天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在79天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da79Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第80天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第80天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da80Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第81天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第81天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da81Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第82天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第82天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da82Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第83天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第83天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da83Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第84天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第84天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da84Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第85天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第85天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da85Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第86天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第86天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da86Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第87天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第87天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da87Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第88天：充值金额,充值人数,充值占比
+     */
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第88天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da88Trend;
+
+    /**
+     * 首日注册且充值用户复充趋势在第89天：充值金额,充值人数,充值占比
      */
-    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第2月：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO m2Trend;
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第89天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da89Trend;
 
     /**
-     * 首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比
+     * 首日注册且充值用户复充趋势在第90天：充值金额,充值人数,充值占比
      */
-    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第3月：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO m3Trend;
+    @ApiModelProperty(value = "首日注册且充值用户复充趋势在第90天：充值金额,充值人数,充值占比")
+    private FirstNewUserAgainTrendVO da90Trend;
 
     /**
      * 首日注册且充值用户复充趋势在第4月：充值金额,充值人数,充值占比
@@ -735,7 +1193,7 @@ public class GameDataFirstNewUserAgainVO {
      * 首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比
      */
     @ApiModelProperty(value = "首日注册且充值用户复充趋势在第1年：充值金额,充值人数,充值占比")
-    private FirstNewUserAgainTrendVO y1Trend;
+    private FirstNewUserAgainTrendVO m12Trend;
 
     /**
      * 首日注册且充值的用户至今：充值金额,充值人数,充值占比

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

@@ -5112,8 +5112,66 @@ public class GameDataServiceImpl implements IGameDataService {
                                     buy_da28 as da28,
                                     buy_da29 as da29,
                                     buy_da30 as da30,
-                                    buy_m2 as m2,
-                                    buy_m3 as m3,
+                                    buy_da31 as da31,
+                                    buy_da32 as da32,
+                                    buy_da33 as da33,
+                                    buy_da34 as da34,
+                                    buy_da35 as da35,
+                                    buy_da36 as da36,
+                                    buy_da37 as da37,
+                                    buy_da38 as da38,
+                                    buy_da39 as da39,
+                                    buy_da40 as da40,
+                                    buy_da41 as da41,
+                                    buy_da42 as da42,
+                                    buy_da43 as da43,
+                                    buy_da44 as da44,
+                                    buy_da45 as da45,
+                                    buy_da46 as da46,
+                                    buy_da47 as da47,
+                                    buy_da48 as da48,
+                                    buy_da49 as da49,
+                                    buy_da50 as da50,
+                                    buy_da51 as da51,
+                                    buy_da52 as da52,
+                                    buy_da53 as da53,
+                                    buy_da54 as da54,
+                                    buy_da55 as da55,
+                                    buy_da56 as da56,
+                                    buy_da57 as da57,
+                                    buy_da58 as da58,
+                                    buy_da59 as da59,
+                                    buy_da60 as da60,
+                                    buy_da61 as da61,
+                                    buy_da62 as da62,
+                                    buy_da63 as da63,
+                                    buy_da64 as da64,
+                                    buy_da65 as da65,
+                                    buy_da66 as da66,
+                                    buy_da67 as da67,
+                                    buy_da68 as da68,
+                                    buy_da69 as da69,
+                                    buy_da70 as da70,
+                                    buy_da71 as da71,
+                                    buy_da72 as da72,
+                                    buy_da73 as da73,
+                                    buy_da74 as da74,
+                                    buy_da75 as da75,
+                                    buy_da76 as da76,
+                                    buy_da77 as da77,
+                                    buy_da78 as da78,
+                                    buy_da79 as da79,
+                                    buy_da80 as da80,
+                                    buy_da81 as da81,
+                                    buy_da82 as da82,
+                                    buy_da83 as da83,
+                                    buy_da84 as da84,
+                                    buy_da85 as da85,
+                                    buy_da86 as da86,
+                                    buy_da87 as da87,
+                                    buy_da88 as da88,
+                                    buy_da89 as da89,
+                                    buy_da90 as da90,
                                     buy_m4 as m4,
                                     buy_m5 as m5,
                                     buy_m6 as m6,
@@ -5122,7 +5180,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                     buy_m9 as m9,
                                     buy_m10 as m10,
                                     buy_m11 as m11,
-                                    buy_y1 as y1,
+                                    buy_m12 as m12,
                                     buy_total as total
                                 FROM
                                     ads_game_first_new_user_again_day
@@ -5224,8 +5282,66 @@ public class GameDataServiceImpl implements IGameDataService {
                                     nature_da28 as da28,
                                     nature_da29 as da29,
                                     nature_da30 as da30,
-                                    nature_m2 as m2,
-                                    nature_m3 as m3,
+                                    nature_da31 as da31,
+                                    nature_da32 as da32,
+                                    nature_da33 as da33,
+                                    nature_da34 as da34,
+                                    nature_da35 as da35,
+                                    nature_da36 as da36,
+                                    nature_da37 as da37,
+                                    nature_da38 as da38,
+                                    nature_da39 as da39,
+                                    nature_da40 as da40,
+                                    nature_da41 as da41,
+                                    nature_da42 as da42,
+                                    nature_da43 as da43,
+                                    nature_da44 as da44,
+                                    nature_da45 as da45,
+                                    nature_da46 as da46,
+                                    nature_da47 as da47,
+                                    nature_da48 as da48,
+                                    nature_da49 as da49,
+                                    nature_da50 as da50,
+                                    nature_da51 as da51,
+                                    nature_da52 as da52,
+                                    nature_da53 as da53,
+                                    nature_da54 as da54,
+                                    nature_da55 as da55,
+                                    nature_da56 as da56,
+                                    nature_da57 as da57,
+                                    nature_da58 as da58,
+                                    nature_da59 as da59,
+                                    nature_da60 as da60,
+                                    nature_da61 as da61,
+                                    nature_da62 as da62,
+                                    nature_da63 as da63,
+                                    nature_da64 as da64,
+                                    nature_da65 as da65,
+                                    nature_da66 as da66,
+                                    nature_da67 as da67,
+                                    nature_da68 as da68,
+                                    nature_da69 as da69,
+                                    nature_da70 as da70,
+                                    nature_da71 as da71,
+                                    nature_da72 as da72,
+                                    nature_da73 as da73,
+                                    nature_da74 as da74,
+                                    nature_da75 as da75,
+                                    nature_da76 as da76,
+                                    nature_da77 as da77,
+                                    nature_da78 as da78,
+                                    nature_da79 as da79,
+                                    nature_da80 as da80,
+                                    nature_da81 as da81,
+                                    nature_da82 as da82,
+                                    nature_da83 as da83,
+                                    nature_da84 as da84,
+                                    nature_da85 as da85,
+                                    nature_da86 as da86,
+                                    nature_da87 as da87,
+                                    nature_da88 as da88,
+                                    nature_da89 as da89,
+                                    nature_da90 as da90,
                                     nature_m4 as m4,
                                     nature_m5 as m5,
                                     nature_m6 as m6,
@@ -5234,7 +5350,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                     nature_m9 as m9,
                                     nature_m10 as m10,
                                     nature_m11 as m11,
-                                    nature_y1 as y1,
+                                    nature_m12 as m12,
                                     nature_total as total
                                 FROM
                                     ads_game_first_new_user_again_day
@@ -5337,8 +5453,66 @@ public class GameDataServiceImpl implements IGameDataService {
                                 da28,
                                 da29,
                                 da30,
-                                m2,
-                                m3,
+                                da31,
+                                da32,
+                                da33,
+                                da34,
+                                da35,
+                                da36,
+                                da37,
+                                da38,
+                                da39,
+                                da40,
+                                da41,
+                                da42,
+                                da43,
+                                da44,
+                                da45,
+                                da46,
+                                da47,
+                                da48,
+                                da49,
+                                da50,
+                                da51,
+                                da52,
+                                da53,
+                                da54,
+                                da55,
+                                da56,
+                                da57,
+                                da58,
+                                da59,
+                                da60,
+                                da61,
+                                da62,
+                                da63,
+                                da64,
+                                da65,
+                                da66,
+                                da67,
+                                da68,
+                                da69,
+                                da70,
+                                da71,
+                                da72,
+                                da73,
+                                da74,
+                                da75,
+                                da76,
+                                da77,
+                                da78,
+                                da79,
+                                da80,
+                                da81,
+                                da82,
+                                da83,
+                                da84,
+                                da85,
+                                da86,
+                                da87,
+                                da88,
+                                da89,
+                                da90,
                                 m4,
                                 m5,
                                 m6,
@@ -5347,7 +5521,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                 m9,
                                 m10,
                                 m11,
-                                y1,
+                                m12,
                                 total
                             FROM
                                 ads_game_first_new_user_again_day
@@ -5377,7 +5551,7 @@ public class GameDataServiceImpl implements IGameDataService {
         StringBuilder trendDay = new StringBuilder(StringUtils.EMPTY);
         trendDay.append("SELECT ");
         //30天数据
-        for (int day = 1; day <= 30; day++) {
+        for (int day = 1; day <= 90; day++) {
             trendDay.append("""
                     CONCAT( SUM(CAST(SPLIT_PART(%sda%s, '/', 1) AS DECIMAL(10, 2))), '/',
                             SUM(CAST(SPLIT_PART(%sda%s, '/', 2) AS BIGINT)), '/',
@@ -5386,7 +5560,7 @@ public class GameDataServiceImpl implements IGameDataService {
                        """.formatted(type, day, type, day, day-1, type, day));
         }
         //m2-m11数据
-        for (int month = 2; month <= 11; month++) {
+        for (int month = 4; month <= 12; month++) {
             trendDay.append("""
                     CONCAT( SUM(CAST(SPLIT_PART(%sm%s, '/', 1) AS DECIMAL(10, 2))), '/',
                             SUM(CAST(SPLIT_PART(%sm%s, '/', 2) AS BIGINT)), '/',
@@ -5394,13 +5568,6 @@ public class GameDataServiceImpl implements IGameDataService {
                     ) AS m%s,
                        """.formatted(type, month, type, month, month, type, month));
         }
-        //y1数据
-        trendDay.append("""
-                CONCAT( SUM(CAST(SPLIT_PART(%sy1, '/', 1) AS DECIMAL(10, 2))), '/',
-                        SUM(CAST(SPLIT_PART(%sy1, '/', 2) AS BIGINT)), '/',
-                        SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= Local.now(), CAST(SPLIT_PART(%sda1, '/', 2) AS BIGINT), 0))
-                ) AS y1,
-                   """.formatted(type, type, type));
         //total数据
         trendDay.append("""
                 CONCAT( SUM(CAST(SPLIT_PART(%stotal, '/', 1) AS DECIMAL(10, 2))), '/',