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

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

@@ -7,12 +7,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class GamePromoteDayTotalVO {
     @ApiModelProperty(notes = "消耗")
     private BigDecimal cost;
@@ -378,20 +374,84 @@ public class GamePromoteDayTotalVO {
     @ApiModelProperty(notes = "不展示--付费趋势：29天")
     private String trendDay29;
 
-    @ApiModelProperty(notes = "不展示--付费趋势：1个月")
-    private String trendMonth1;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：2个月")
-    private String trendMonth2;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：3个月")
-    private String trendMonth3;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：6个月")
+    @ApiModelProperty(notes = "不展示")
+    private String trendDay30;
+    private String trendDay31;
+    private String trendDay32;
+    private String trendDay33;
+    private String trendDay34;
+    private String trendDay35;
+    private String trendDay36;
+    private String trendDay37;
+    private String trendDay38;
+    private String trendDay39;
+
+    private String trendDay40;
+    private String trendDay41;
+    private String trendDay42;
+    private String trendDay43;
+    private String trendDay44;
+    private String trendDay45;
+    private String trendDay46;
+    private String trendDay47;
+    private String trendDay48;
+    private String trendDay49;
+
+    private String trendDay50;
+    private String trendDay51;
+    private String trendDay52;
+    private String trendDay53;
+    private String trendDay54;
+    private String trendDay55;
+    private String trendDay56;
+    private String trendDay57;
+    private String trendDay58;
+    private String trendDay59;
+
+    private String trendDay60;
+    private String trendDay61;
+    private String trendDay62;
+    private String trendDay63;
+    private String trendDay64;
+    private String trendDay65;
+    private String trendDay66;
+    private String trendDay67;
+    private String trendDay68;
+    private String trendDay69;
+
+    private String trendDay70;
+    private String trendDay71;
+    private String trendDay72;
+    private String trendDay73;
+    private String trendDay74;
+    private String trendDay75;
+    private String trendDay76;
+    private String trendDay77;
+    private String trendDay78;
+    private String trendDay79;
+
+    private String trendDay80;
+    private String trendDay81;
+    private String trendDay82;
+    private String trendDay83;
+    private String trendDay84;
+    private String trendDay85;
+    private String trendDay86;
+    private String trendDay87;
+    private String trendDay88;
+    private String trendDay89;
+    private String trendDay90;
+
+    @ApiModelProperty(notes = "不展示")
+    private String trendMonth4;
+    private String trendMonth5;
     private String trendMonth6;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：1年")
-    private String trendYear1;
+    private String trendMonth7;
+    private String trendMonth8;
+    private String trendMonth9;
+    private String trendMonth10;
+    private String trendMonth11;
+    private String trendMonth12;
 
     @ApiModelProperty(notes = "不展示--付费趋势：总")
     private String trendTotal;
@@ -483,20 +543,160 @@ public class GamePromoteDayTotalVO {
     @ApiModelProperty(notes = "付费趋势：29天")
     private RechargeTrendVO rechargeTrendDay29;
 
-    @ApiModelProperty(notes = "付费趋势：1个月")
-    private RechargeTrendVO rechargeTrendMonth1;
-
-    @ApiModelProperty(notes = "付费趋势：2个月")
-    private RechargeTrendVO rechargeTrendMonth2;
-
-    @ApiModelProperty(notes = "付费趋势：3个月")
-    private RechargeTrendVO rechargeTrendMonth3;
+    @ApiModelProperty(notes = "付费趋势：30天")
+    private RechargeTrendVO rechargeTrendDay30;
+    @ApiModelProperty(notes = "付费趋势：31天")
+    private RechargeTrendVO rechargeTrendDay31;
+    @ApiModelProperty(notes = "付费趋势：32天")
+    private RechargeTrendVO rechargeTrendDay32;
+    @ApiModelProperty(notes = "付费趋势：33天")
+    private RechargeTrendVO rechargeTrendDay33;
+    @ApiModelProperty(notes = "付费趋势：34天")
+    private RechargeTrendVO rechargeTrendDay34;
+    @ApiModelProperty(notes = "付费趋势：35天")
+    private RechargeTrendVO rechargeTrendDay35;
+    @ApiModelProperty(notes = "付费趋势：36天")
+    private RechargeTrendVO rechargeTrendDay36;
+    @ApiModelProperty(notes = "付费趋势：37天")
+    private RechargeTrendVO rechargeTrendDay37;
+    @ApiModelProperty(notes = "付费趋势：38天")
+    private RechargeTrendVO rechargeTrendDay38;
+    @ApiModelProperty(notes = "付费趋势：39天")
+    private RechargeTrendVO rechargeTrendDay39;
+
+    @ApiModelProperty(notes = "付费趋势：40天")
+    private RechargeTrendVO rechargeTrendDay40;
+    @ApiModelProperty(notes = "付费趋势：41天")
+    private RechargeTrendVO rechargeTrendDay41;
+    @ApiModelProperty(notes = "付费趋势：42天")
+    private RechargeTrendVO rechargeTrendDay42;
+    @ApiModelProperty(notes = "付费趋势：43天")
+    private RechargeTrendVO rechargeTrendDay43;
+    @ApiModelProperty(notes = "付费趋势：44天")
+    private RechargeTrendVO rechargeTrendDay44;
+    @ApiModelProperty(notes = "付费趋势：45天")
+    private RechargeTrendVO rechargeTrendDay45;
+    @ApiModelProperty(notes = "付费趋势：46天")
+    private RechargeTrendVO rechargeTrendDay46;
+    @ApiModelProperty(notes = "付费趋势：47天")
+    private RechargeTrendVO rechargeTrendDay47;
+    @ApiModelProperty(notes = "付费趋势：48天")
+    private RechargeTrendVO rechargeTrendDay48;
+    @ApiModelProperty(notes = "付费趋势：49天")
+    private RechargeTrendVO rechargeTrendDay49;
+
+    @ApiModelProperty(notes = "付费趋势：50天")
+    private RechargeTrendVO rechargeTrendDay50;
+    @ApiModelProperty(notes = "付费趋势：51天")
+    private RechargeTrendVO rechargeTrendDay51;
+    @ApiModelProperty(notes = "付费趋势：52天")
+    private RechargeTrendVO rechargeTrendDay52;
+    @ApiModelProperty(notes = "付费趋势：53天")
+    private RechargeTrendVO rechargeTrendDay53;
+    @ApiModelProperty(notes = "付费趋势：54天")
+    private RechargeTrendVO rechargeTrendDay54;
+    @ApiModelProperty(notes = "付费趋势：55天")
+    private RechargeTrendVO rechargeTrendDay55;
+    @ApiModelProperty(notes = "付费趋势：56天")
+    private RechargeTrendVO rechargeTrendDay56;
+    @ApiModelProperty(notes = "付费趋势：57天")
+    private RechargeTrendVO rechargeTrendDay57;
+    @ApiModelProperty(notes = "付费趋势：58天")
+    private RechargeTrendVO rechargeTrendDay58;
+    @ApiModelProperty(notes = "付费趋势：59天")
+    private RechargeTrendVO rechargeTrendDay59;
+
+    @ApiModelProperty(notes = "付费趋势：60天")
+    private RechargeTrendVO rechargeTrendDay60;
+    @ApiModelProperty(notes = "付费趋势：61天")
+    private RechargeTrendVO rechargeTrendDay61;
+    @ApiModelProperty(notes = "付费趋势：62天")
+    private RechargeTrendVO rechargeTrendDay62;
+    @ApiModelProperty(notes = "付费趋势：63天")
+    private RechargeTrendVO rechargeTrendDay63;
+    @ApiModelProperty(notes = "付费趋势：64天")
+    private RechargeTrendVO rechargeTrendDay64;
+    @ApiModelProperty(notes = "付费趋势：65天")
+    private RechargeTrendVO rechargeTrendDay65;
+    @ApiModelProperty(notes = "付费趋势：66天")
+    private RechargeTrendVO rechargeTrendDay66;
+    @ApiModelProperty(notes = "付费趋势：67天")
+    private RechargeTrendVO rechargeTrendDay67;
+    @ApiModelProperty(notes = "付费趋势：68天")
+    private RechargeTrendVO rechargeTrendDay68;
+    @ApiModelProperty(notes = "付费趋势：69天")
+    private RechargeTrendVO rechargeTrendDay69;
+
+    @ApiModelProperty(notes = "付费趋势：70天")
+    private RechargeTrendVO rechargeTrendDay70;
+    @ApiModelProperty(notes = "付费趋势：71天")
+    private RechargeTrendVO rechargeTrendDay71;
+    @ApiModelProperty(notes = "付费趋势：72天")
+    private RechargeTrendVO rechargeTrendDay72;
+    @ApiModelProperty(notes = "付费趋势：73天")
+    private RechargeTrendVO rechargeTrendDay73;
+    @ApiModelProperty(notes = "付费趋势：74天")
+    private RechargeTrendVO rechargeTrendDay74;
+    @ApiModelProperty(notes = "付费趋势：75天")
+    private RechargeTrendVO rechargeTrendDay75;
+    @ApiModelProperty(notes = "付费趋势：76天")
+    private RechargeTrendVO rechargeTrendDay76;
+    @ApiModelProperty(notes = "付费趋势：77天")
+    private RechargeTrendVO rechargeTrendDay77;
+    @ApiModelProperty(notes = "付费趋势：78天")
+    private RechargeTrendVO rechargeTrendDay78;
+    @ApiModelProperty(notes = "付费趋势：79天")
+    private RechargeTrendVO rechargeTrendDay79;
+
+    @ApiModelProperty(notes = "付费趋势：80天")
+    private RechargeTrendVO rechargeTrendDay80;
+    @ApiModelProperty(notes = "付费趋势：81天")
+    private RechargeTrendVO rechargeTrendDay81;
+    @ApiModelProperty(notes = "付费趋势：82天")
+    private RechargeTrendVO rechargeTrendDay82;
+    @ApiModelProperty(notes = "付费趋势：83天")
+    private RechargeTrendVO rechargeTrendDay83;
+    @ApiModelProperty(notes = "付费趋势：84天")
+    private RechargeTrendVO rechargeTrendDay84;
+    @ApiModelProperty(notes = "付费趋势：85天")
+    private RechargeTrendVO rechargeTrendDay85;
+    @ApiModelProperty(notes = "付费趋势：86天")
+    private RechargeTrendVO rechargeTrendDay86;
+    @ApiModelProperty(notes = "付费趋势：87天")
+    private RechargeTrendVO rechargeTrendDay87;
+    @ApiModelProperty(notes = "付费趋势：88天")
+    private RechargeTrendVO rechargeTrendDay88;
+    @ApiModelProperty(notes = "付费趋势：89天")
+    private RechargeTrendVO rechargeTrendDay89;
+    @ApiModelProperty(notes = "付费趋势：90天")
+    private RechargeTrendVO rechargeTrendDay90;
+
+    @ApiModelProperty(notes = "付费趋势：4个月")
+    private RechargeTrendVO rechargeTrendMonth4;
+
+    @ApiModelProperty(notes = "付费趋势：5个月")
+    private RechargeTrendVO rechargeTrendMonth5;
 
     @ApiModelProperty(notes = "付费趋势：6个月")
     private RechargeTrendVO rechargeTrendMonth6;
 
+    @ApiModelProperty(notes = "付费趋势：7个月")
+    private RechargeTrendVO rechargeTrendMonth7;
+
+    @ApiModelProperty(notes = "付费趋势：8个月")
+    private RechargeTrendVO rechargeTrendMonth8;
+
+    @ApiModelProperty(notes = "付费趋势：9个月")
+    private RechargeTrendVO rechargeTrendMonth9;
+
+    @ApiModelProperty(notes = "付费趋势：10个月")
+    private RechargeTrendVO rechargeTrendMonth10;
+
+    @ApiModelProperty(notes = "付费趋势：11个月")
+    private RechargeTrendVO rechargeTrendMonth11;
+
     @ApiModelProperty(notes = "付费趋势：1年")
-    private RechargeTrendVO rechargeTrendYear1;
+    private RechargeTrendVO rechargeTrendMonth12;
 
     @ApiModelProperty(notes = "付费趋势：总")
     private RechargeTrendVO rechargeTrendTotal;

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

@@ -10,9 +10,6 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class GamePromoteDayVO {
     private String id;
     @ApiModelProperty(notes = "日期")
@@ -413,7 +410,6 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "不展示--付费趋势：25天")
     private String trendDay25;
 
-    // Continue the pattern for trendDay26 to trendDay30
     @ApiModelProperty(notes = "不展示--付费趋势：26天")
     private String trendDay26;
 
@@ -426,20 +422,84 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "不展示--付费趋势：29天")
     private String trendDay29;
 
-    @ApiModelProperty(notes = "不展示--付费趋势：1个月")
-    private String trendMonth1;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：2个月")
-    private String trendMonth2;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：3个月")
-    private String trendMonth3;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：6个月")
+    @ApiModelProperty(notes = "不展示")
+    private String trendDay30;
+    private String trendDay31;
+    private String trendDay32;
+    private String trendDay33;
+    private String trendDay34;
+    private String trendDay35;
+    private String trendDay36;
+    private String trendDay37;
+    private String trendDay38;
+    private String trendDay39;
+
+    private String trendDay40;
+    private String trendDay41;
+    private String trendDay42;
+    private String trendDay43;
+    private String trendDay44;
+    private String trendDay45;
+    private String trendDay46;
+    private String trendDay47;
+    private String trendDay48;
+    private String trendDay49;
+
+    private String trendDay50;
+    private String trendDay51;
+    private String trendDay52;
+    private String trendDay53;
+    private String trendDay54;
+    private String trendDay55;
+    private String trendDay56;
+    private String trendDay57;
+    private String trendDay58;
+    private String trendDay59;
+
+    private String trendDay60;
+    private String trendDay61;
+    private String trendDay62;
+    private String trendDay63;
+    private String trendDay64;
+    private String trendDay65;
+    private String trendDay66;
+    private String trendDay67;
+    private String trendDay68;
+    private String trendDay69;
+
+    private String trendDay70;
+    private String trendDay71;
+    private String trendDay72;
+    private String trendDay73;
+    private String trendDay74;
+    private String trendDay75;
+    private String trendDay76;
+    private String trendDay77;
+    private String trendDay78;
+    private String trendDay79;
+
+    private String trendDay80;
+    private String trendDay81;
+    private String trendDay82;
+    private String trendDay83;
+    private String trendDay84;
+    private String trendDay85;
+    private String trendDay86;
+    private String trendDay87;
+    private String trendDay88;
+    private String trendDay89;
+    private String trendDay90;
+
+    @ApiModelProperty(notes = "不展示")
+    private String trendMonth4;
+    private String trendMonth5;
     private String trendMonth6;
-
-    @ApiModelProperty(notes = "不展示--付费趋势：1年")
-    private String trendYear1;
+    private String trendMonth7;
+    private String trendMonth8;
+    private String trendMonth9;
+    private String trendMonth10;
+    private String trendMonth11;
+    private String trendMonth12;
 
     @ApiModelProperty(notes = "不展示--付费趋势：总")
     private String trendTotal;
@@ -531,20 +591,160 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "付费趋势：29天")
     private RechargeTrendVO rechargeTrendDay29;
 
-    @ApiModelProperty(notes = "付费趋势：1个月")
-    private RechargeTrendVO rechargeTrendMonth1;
-
-    @ApiModelProperty(notes = "付费趋势：2个月")
-    private RechargeTrendVO rechargeTrendMonth2;
-
-    @ApiModelProperty(notes = "付费趋势：3个月")
-    private RechargeTrendVO rechargeTrendMonth3;
+    @ApiModelProperty(notes = "付费趋势：30天")
+    private RechargeTrendVO rechargeTrendDay30;
+    @ApiModelProperty(notes = "付费趋势：31天")
+    private RechargeTrendVO rechargeTrendDay31;
+    @ApiModelProperty(notes = "付费趋势：32天")
+    private RechargeTrendVO rechargeTrendDay32;
+    @ApiModelProperty(notes = "付费趋势：33天")
+    private RechargeTrendVO rechargeTrendDay33;
+    @ApiModelProperty(notes = "付费趋势：34天")
+    private RechargeTrendVO rechargeTrendDay34;
+    @ApiModelProperty(notes = "付费趋势：35天")
+    private RechargeTrendVO rechargeTrendDay35;
+    @ApiModelProperty(notes = "付费趋势：36天")
+    private RechargeTrendVO rechargeTrendDay36;
+    @ApiModelProperty(notes = "付费趋势：37天")
+    private RechargeTrendVO rechargeTrendDay37;
+    @ApiModelProperty(notes = "付费趋势：38天")
+    private RechargeTrendVO rechargeTrendDay38;
+    @ApiModelProperty(notes = "付费趋势：39天")
+    private RechargeTrendVO rechargeTrendDay39;
+
+    @ApiModelProperty(notes = "付费趋势：40天")
+    private RechargeTrendVO rechargeTrendDay40;
+    @ApiModelProperty(notes = "付费趋势：41天")
+    private RechargeTrendVO rechargeTrendDay41;
+    @ApiModelProperty(notes = "付费趋势：42天")
+    private RechargeTrendVO rechargeTrendDay42;
+    @ApiModelProperty(notes = "付费趋势：43天")
+    private RechargeTrendVO rechargeTrendDay43;
+    @ApiModelProperty(notes = "付费趋势：44天")
+    private RechargeTrendVO rechargeTrendDay44;
+    @ApiModelProperty(notes = "付费趋势：45天")
+    private RechargeTrendVO rechargeTrendDay45;
+    @ApiModelProperty(notes = "付费趋势：46天")
+    private RechargeTrendVO rechargeTrendDay46;
+    @ApiModelProperty(notes = "付费趋势：47天")
+    private RechargeTrendVO rechargeTrendDay47;
+    @ApiModelProperty(notes = "付费趋势：48天")
+    private RechargeTrendVO rechargeTrendDay48;
+    @ApiModelProperty(notes = "付费趋势：49天")
+    private RechargeTrendVO rechargeTrendDay49;
+
+    @ApiModelProperty(notes = "付费趋势：50天")
+    private RechargeTrendVO rechargeTrendDay50;
+    @ApiModelProperty(notes = "付费趋势：51天")
+    private RechargeTrendVO rechargeTrendDay51;
+    @ApiModelProperty(notes = "付费趋势：52天")
+    private RechargeTrendVO rechargeTrendDay52;
+    @ApiModelProperty(notes = "付费趋势：53天")
+    private RechargeTrendVO rechargeTrendDay53;
+    @ApiModelProperty(notes = "付费趋势：54天")
+    private RechargeTrendVO rechargeTrendDay54;
+    @ApiModelProperty(notes = "付费趋势：55天")
+    private RechargeTrendVO rechargeTrendDay55;
+    @ApiModelProperty(notes = "付费趋势：56天")
+    private RechargeTrendVO rechargeTrendDay56;
+    @ApiModelProperty(notes = "付费趋势：57天")
+    private RechargeTrendVO rechargeTrendDay57;
+    @ApiModelProperty(notes = "付费趋势：58天")
+    private RechargeTrendVO rechargeTrendDay58;
+    @ApiModelProperty(notes = "付费趋势：59天")
+    private RechargeTrendVO rechargeTrendDay59;
+
+    @ApiModelProperty(notes = "付费趋势：60天")
+    private RechargeTrendVO rechargeTrendDay60;
+    @ApiModelProperty(notes = "付费趋势：61天")
+    private RechargeTrendVO rechargeTrendDay61;
+    @ApiModelProperty(notes = "付费趋势：62天")
+    private RechargeTrendVO rechargeTrendDay62;
+    @ApiModelProperty(notes = "付费趋势：63天")
+    private RechargeTrendVO rechargeTrendDay63;
+    @ApiModelProperty(notes = "付费趋势：64天")
+    private RechargeTrendVO rechargeTrendDay64;
+    @ApiModelProperty(notes = "付费趋势：65天")
+    private RechargeTrendVO rechargeTrendDay65;
+    @ApiModelProperty(notes = "付费趋势：66天")
+    private RechargeTrendVO rechargeTrendDay66;
+    @ApiModelProperty(notes = "付费趋势：67天")
+    private RechargeTrendVO rechargeTrendDay67;
+    @ApiModelProperty(notes = "付费趋势：68天")
+    private RechargeTrendVO rechargeTrendDay68;
+    @ApiModelProperty(notes = "付费趋势：69天")
+    private RechargeTrendVO rechargeTrendDay69;
+
+    @ApiModelProperty(notes = "付费趋势：70天")
+    private RechargeTrendVO rechargeTrendDay70;
+    @ApiModelProperty(notes = "付费趋势：71天")
+    private RechargeTrendVO rechargeTrendDay71;
+    @ApiModelProperty(notes = "付费趋势：72天")
+    private RechargeTrendVO rechargeTrendDay72;
+    @ApiModelProperty(notes = "付费趋势：73天")
+    private RechargeTrendVO rechargeTrendDay73;
+    @ApiModelProperty(notes = "付费趋势：74天")
+    private RechargeTrendVO rechargeTrendDay74;
+    @ApiModelProperty(notes = "付费趋势：75天")
+    private RechargeTrendVO rechargeTrendDay75;
+    @ApiModelProperty(notes = "付费趋势：76天")
+    private RechargeTrendVO rechargeTrendDay76;
+    @ApiModelProperty(notes = "付费趋势：77天")
+    private RechargeTrendVO rechargeTrendDay77;
+    @ApiModelProperty(notes = "付费趋势：78天")
+    private RechargeTrendVO rechargeTrendDay78;
+    @ApiModelProperty(notes = "付费趋势：79天")
+    private RechargeTrendVO rechargeTrendDay79;
+
+    @ApiModelProperty(notes = "付费趋势：80天")
+    private RechargeTrendVO rechargeTrendDay80;
+    @ApiModelProperty(notes = "付费趋势：81天")
+    private RechargeTrendVO rechargeTrendDay81;
+    @ApiModelProperty(notes = "付费趋势：82天")
+    private RechargeTrendVO rechargeTrendDay82;
+    @ApiModelProperty(notes = "付费趋势：83天")
+    private RechargeTrendVO rechargeTrendDay83;
+    @ApiModelProperty(notes = "付费趋势：84天")
+    private RechargeTrendVO rechargeTrendDay84;
+    @ApiModelProperty(notes = "付费趋势：85天")
+    private RechargeTrendVO rechargeTrendDay85;
+    @ApiModelProperty(notes = "付费趋势：86天")
+    private RechargeTrendVO rechargeTrendDay86;
+    @ApiModelProperty(notes = "付费趋势：87天")
+    private RechargeTrendVO rechargeTrendDay87;
+    @ApiModelProperty(notes = "付费趋势：88天")
+    private RechargeTrendVO rechargeTrendDay88;
+    @ApiModelProperty(notes = "付费趋势：89天")
+    private RechargeTrendVO rechargeTrendDay89;
+    @ApiModelProperty(notes = "付费趋势：90天")
+    private RechargeTrendVO rechargeTrendDay90;
+
+    @ApiModelProperty(notes = "付费趋势：4个月")
+    private RechargeTrendVO rechargeTrendMonth4;
+
+    @ApiModelProperty(notes = "付费趋势：5个月")
+    private RechargeTrendVO rechargeTrendMonth5;
 
     @ApiModelProperty(notes = "付费趋势：6个月")
     private RechargeTrendVO rechargeTrendMonth6;
 
+    @ApiModelProperty(notes = "付费趋势：7个月")
+    private RechargeTrendVO rechargeTrendMonth7;
+
+    @ApiModelProperty(notes = "付费趋势：8个月")
+    private RechargeTrendVO rechargeTrendMonth8;
+
+    @ApiModelProperty(notes = "付费趋势：9个月")
+    private RechargeTrendVO rechargeTrendMonth9;
+
+    @ApiModelProperty(notes = "付费趋势：10个月")
+    private RechargeTrendVO rechargeTrendMonth10;
+
+    @ApiModelProperty(notes = "付费趋势：11个月")
+    private RechargeTrendVO rechargeTrendMonth11;
+
     @ApiModelProperty(notes = "付费趋势：1年")
-    private RechargeTrendVO rechargeTrendYear1;
+    private RechargeTrendVO rechargeTrendMonth12;
 
     @ApiModelProperty(notes = "付费趋势：总")
     private RechargeTrendVO rechargeTrendTotal;

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

@@ -235,23 +235,133 @@ public class GameServerDayTotalVO {
     @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月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -305,7 +415,7 @@ public class GameServerDayTotalVO {
      * 区服在第1年：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
     @ApiModelProperty(value = "不展示")
-    private String y1;
+    private String m12;
 
     /**
      * 区服至今：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -494,16 +604,364 @@ public class GameServerDayTotalVO {
     private GameServerTrendVO da30Trend;
 
     /**
-     * 区服在第2月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     * 区服第31天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第31天")
+    private GameServerTrendVO da31Trend;
+
+    /**
+     * 区服在第32天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第32天")
+    private GameServerTrendVO da32Trend;
+
+    /**
+     * 区服在第33天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第33天")
+    private GameServerTrendVO da33Trend;
+
+    /**
+     * 区服在第34天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第34天")
+    private GameServerTrendVO da34Trend;
+
+    /**
+     * 区服在第35天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第35天")
+    private GameServerTrendVO da35Trend;
+
+    /**
+     * 区服在第36天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第36天")
+    private GameServerTrendVO da36Trend;
+
+    /**
+     * 区服在第37天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第37天")
+    private GameServerTrendVO da37Trend;
+
+    /**
+     * 区服在第38天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第38天")
+    private GameServerTrendVO da38Trend;
+
+    /**
+     * 区服在第39天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第39天")
+    private GameServerTrendVO da39Trend;
+
+    /**
+     * 区服在第40天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第40天")
+    private GameServerTrendVO da40Trend;
+
+    /**
+     * 区服在第41天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第41天")
+    private GameServerTrendVO da41Trend;
+
+    /**
+     * 区服在第42天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第42天")
+    private GameServerTrendVO da42Trend;
+
+    /**
+     * 区服在第43天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第43天")
+    private GameServerTrendVO da43Trend;
+
+    /**
+     * 区服在第44天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第44天")
+    private GameServerTrendVO da44Trend;
+
+    /**
+     * 区服在第45天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第45天")
+    private GameServerTrendVO da45Trend;
+
+    /**
+     * 区服在第46天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第46天")
+    private GameServerTrendVO da46Trend;
+
+    /**
+     * 区服在第47天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第47天")
+    private GameServerTrendVO da47Trend;
+
+    /**
+     * 区服在第48天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第48天")
+    private GameServerTrendVO da48Trend;
+
+    /**
+     * 区服在第49天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第49天")
+    private GameServerTrendVO da49Trend;
+
+    /**
+     * 区服在第50天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第50天")
+    private GameServerTrendVO da50Trend;
+
+    /**
+     * 区服在第51天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第51天")
+    private GameServerTrendVO da51Trend;
+
+    /**
+     * 区服在第52天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第52天")
+    private GameServerTrendVO da52Trend;
+
+    /**
+     * 区服在第53天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第53天")
+    private GameServerTrendVO da53Trend;
+
+    /**
+     * 区服在第54天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第54天")
+    private GameServerTrendVO da54Trend;
+
+    /**
+     * 区服在第55天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第55天")
+    private GameServerTrendVO da55Trend;
+
+    /**
+     * 区服在第56天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第56天")
+    private GameServerTrendVO da56Trend;
+
+    /**
+     * 区服在第57天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第57天")
+    private GameServerTrendVO da57Trend;
+
+    /**
+     * 区服在第58天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第58天")
+    private GameServerTrendVO da58Trend;
+
+    /**
+     * 区服在第59天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第59天")
+    private GameServerTrendVO da59Trend;
+
+    /**
+     * 区服在第60天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第60天")
+    private GameServerTrendVO da60Trend;
+
+    /**
+     * 区服第61天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第61天")
+    private GameServerTrendVO da61Trend;
+
+    /**
+     * 区服在第62天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第62天")
+    private GameServerTrendVO da62Trend;
+
+    /**
+     * 区服在第63天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第63天")
+    private GameServerTrendVO da63Trend;
+
+    /**
+     * 区服在第64天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第64天")
+    private GameServerTrendVO da64Trend;
+
+    /**
+     * 区服在第65天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第65天")
+    private GameServerTrendVO da65Trend;
+
+    /**
+     * 区服在第66天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第66天")
+    private GameServerTrendVO da66Trend;
+
+    /**
+     * 区服在第67天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第67天")
+    private GameServerTrendVO da67Trend;
+
+    /**
+     * 区服在第68天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第68天")
+    private GameServerTrendVO da68Trend;
+
+    /**
+     * 区服在第69天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第69天")
+    private GameServerTrendVO da69Trend;
+
+    /**
+     * 区服在第70天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第70天")
+    private GameServerTrendVO da70Trend;
+
+    /**
+     * 区服在第71天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第71天")
+    private GameServerTrendVO da71Trend;
+
+    /**
+     * 区服在第72天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第72天")
+    private GameServerTrendVO da72Trend;
+
+    /**
+     * 区服在第73天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第73天")
+    private GameServerTrendVO da73Trend;
+
+    /**
+     * 区服在第74天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第74天")
+    private GameServerTrendVO da74Trend;
+
+    /**
+     * 区服在第75天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第75天")
+    private GameServerTrendVO da75Trend;
+
+    /**
+     * 区服在第76天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第76天")
+    private GameServerTrendVO da76Trend;
+
+    /**
+     * 区服在第77天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第77天")
+    private GameServerTrendVO da77Trend;
+
+    /**
+     * 区服在第78天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第78天")
+    private GameServerTrendVO da78Trend;
+
+    /**
+     * 区服在第79天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第79天")
+    private GameServerTrendVO da79Trend;
+
+    /**
+     * 区服在第80天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第80天")
+    private GameServerTrendVO da80Trend;
+
+    /**
+     * 区服在第81天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第81天")
+    private GameServerTrendVO da81Trend;
+
+    /**
+     * 区服在第82天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第82天")
+    private GameServerTrendVO da82Trend;
+
+    /**
+     * 区服在第83天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第83天")
+    private GameServerTrendVO da83Trend;
+
+    /**
+     * 区服在第84天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第84天")
+    private GameServerTrendVO da84Trend;
+
+    /**
+     * 区服在第85天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第85天")
+    private GameServerTrendVO da85Trend;
+
+    /**
+     * 区服在第86天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第86天")
+    private GameServerTrendVO da86Trend;
+
+    /**
+     * 区服在第87天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第87天")
+    private GameServerTrendVO da87Trend;
+
+    /**
+     * 区服在第88天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第88天")
+    private GameServerTrendVO da88Trend;
+
+    /**
+     * 区服在第89天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
-    @ApiModelProperty(value = "区服第2月")
-    private GameServerTrendVO m2Trend;
+    @ApiModelProperty(value = "区服第89天")
+    private GameServerTrendVO da89Trend;
 
     /**
-     * 区服在第3月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     * 区服在第90天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
-    @ApiModelProperty(value = "区服第3月")
-    private GameServerTrendVO m3Trend;
+    @ApiModelProperty(value = "区服第90天")
+    private GameServerTrendVO da90Trend;
 
     /**
      * 区服在第4月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -557,7 +1015,7 @@ public class GameServerDayTotalVO {
      * 区服在第1年：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
     @ApiModelProperty(value = "区服第1年")
-    private GameServerTrendVO y1Trend;
+    private GameServerTrendVO m12Trend;
 
     /**
      * 区服至今：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比

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

@@ -278,23 +278,133 @@ public class GameServerDayVO {
     @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月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -348,7 +458,7 @@ public class GameServerDayVO {
      * 区服在第1年：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
     @ApiModelProperty(value = "不展示")
-    private String y1;
+    private String m12;
 
     /**
      * 区服至今：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -537,16 +647,364 @@ public class GameServerDayVO {
     private GameServerTrendVO da30Trend;
 
     /**
-     * 区服在第2月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     * 区服第31天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第31天")
+    private GameServerTrendVO da31Trend;
+
+    /**
+     * 区服在第32天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第32天")
+    private GameServerTrendVO da32Trend;
+
+    /**
+     * 区服在第33天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第33天")
+    private GameServerTrendVO da33Trend;
+
+    /**
+     * 区服在第34天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第34天")
+    private GameServerTrendVO da34Trend;
+
+    /**
+     * 区服在第35天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第35天")
+    private GameServerTrendVO da35Trend;
+
+    /**
+     * 区服在第36天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第36天")
+    private GameServerTrendVO da36Trend;
+
+    /**
+     * 区服在第37天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第37天")
+    private GameServerTrendVO da37Trend;
+
+    /**
+     * 区服在第38天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第38天")
+    private GameServerTrendVO da38Trend;
+
+    /**
+     * 区服在第39天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第39天")
+    private GameServerTrendVO da39Trend;
+
+    /**
+     * 区服在第40天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第40天")
+    private GameServerTrendVO da40Trend;
+
+    /**
+     * 区服在第41天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第41天")
+    private GameServerTrendVO da41Trend;
+
+    /**
+     * 区服在第42天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第42天")
+    private GameServerTrendVO da42Trend;
+
+    /**
+     * 区服在第43天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第43天")
+    private GameServerTrendVO da43Trend;
+
+    /**
+     * 区服在第44天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第44天")
+    private GameServerTrendVO da44Trend;
+
+    /**
+     * 区服在第45天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第45天")
+    private GameServerTrendVO da45Trend;
+
+    /**
+     * 区服在第46天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第46天")
+    private GameServerTrendVO da46Trend;
+
+    /**
+     * 区服在第47天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第47天")
+    private GameServerTrendVO da47Trend;
+
+    /**
+     * 区服在第48天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第48天")
+    private GameServerTrendVO da48Trend;
+
+    /**
+     * 区服在第49天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第49天")
+    private GameServerTrendVO da49Trend;
+
+    /**
+     * 区服在第50天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第50天")
+    private GameServerTrendVO da50Trend;
+
+    /**
+     * 区服在第51天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第51天")
+    private GameServerTrendVO da51Trend;
+
+    /**
+     * 区服在第52天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第52天")
+    private GameServerTrendVO da52Trend;
+
+    /**
+     * 区服在第53天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第53天")
+    private GameServerTrendVO da53Trend;
+
+    /**
+     * 区服在第54天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第54天")
+    private GameServerTrendVO da54Trend;
+
+    /**
+     * 区服在第55天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第55天")
+    private GameServerTrendVO da55Trend;
+
+    /**
+     * 区服在第56天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第56天")
+    private GameServerTrendVO da56Trend;
+
+    /**
+     * 区服在第57天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第57天")
+    private GameServerTrendVO da57Trend;
+
+    /**
+     * 区服在第58天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第58天")
+    private GameServerTrendVO da58Trend;
+
+    /**
+     * 区服在第59天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第59天")
+    private GameServerTrendVO da59Trend;
+
+    /**
+     * 区服在第60天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第60天")
+    private GameServerTrendVO da60Trend;
+
+    /**
+     * 区服第61天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第61天")
+    private GameServerTrendVO da61Trend;
+
+    /**
+     * 区服在第62天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第62天")
+    private GameServerTrendVO da62Trend;
+
+    /**
+     * 区服在第63天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第63天")
+    private GameServerTrendVO da63Trend;
+
+    /**
+     * 区服在第64天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第64天")
+    private GameServerTrendVO da64Trend;
+
+    /**
+     * 区服在第65天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第65天")
+    private GameServerTrendVO da65Trend;
+
+    /**
+     * 区服在第66天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第66天")
+    private GameServerTrendVO da66Trend;
+
+    /**
+     * 区服在第67天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第67天")
+    private GameServerTrendVO da67Trend;
+
+    /**
+     * 区服在第68天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第68天")
+    private GameServerTrendVO da68Trend;
+
+    /**
+     * 区服在第69天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第69天")
+    private GameServerTrendVO da69Trend;
+
+    /**
+     * 区服在第70天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第70天")
+    private GameServerTrendVO da70Trend;
+
+    /**
+     * 区服在第71天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第71天")
+    private GameServerTrendVO da71Trend;
+
+    /**
+     * 区服在第72天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第72天")
+    private GameServerTrendVO da72Trend;
+
+    /**
+     * 区服在第73天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第73天")
+    private GameServerTrendVO da73Trend;
+
+    /**
+     * 区服在第74天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第74天")
+    private GameServerTrendVO da74Trend;
+
+    /**
+     * 区服在第75天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第75天")
+    private GameServerTrendVO da75Trend;
+
+    /**
+     * 区服在第76天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第76天")
+    private GameServerTrendVO da76Trend;
+
+    /**
+     * 区服在第77天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第77天")
+    private GameServerTrendVO da77Trend;
+
+    /**
+     * 区服在第78天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第78天")
+    private GameServerTrendVO da78Trend;
+
+    /**
+     * 区服在第79天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第79天")
+    private GameServerTrendVO da79Trend;
+
+    /**
+     * 区服在第80天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第80天")
+    private GameServerTrendVO da80Trend;
+
+    /**
+     * 区服在第81天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第81天")
+    private GameServerTrendVO da81Trend;
+
+    /**
+     * 区服在第82天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第82天")
+    private GameServerTrendVO da82Trend;
+
+    /**
+     * 区服在第83天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第83天")
+    private GameServerTrendVO da83Trend;
+
+    /**
+     * 区服在第84天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第84天")
+    private GameServerTrendVO da84Trend;
+
+    /**
+     * 区服在第85天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第85天")
+    private GameServerTrendVO da85Trend;
+
+    /**
+     * 区服在第86天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第86天")
+    private GameServerTrendVO da86Trend;
+
+    /**
+     * 区服在第87天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第87天")
+    private GameServerTrendVO da87Trend;
+
+    /**
+     * 区服在第88天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     */
+    @ApiModelProperty(value = "区服第88天")
+    private GameServerTrendVO da88Trend;
+
+    /**
+     * 区服在第89天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
-    @ApiModelProperty(value = "区服第2月")
-    private GameServerTrendVO m2Trend;
+    @ApiModelProperty(value = "区服第89天")
+    private GameServerTrendVO da89Trend;
 
     /**
-     * 区服在第3月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
+     * 区服在第90天：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
-    @ApiModelProperty(value = "区服第3月")
-    private GameServerTrendVO m3Trend;
+    @ApiModelProperty(value = "区服第90天")
+    private GameServerTrendVO da90Trend;
 
     /**
      * 区服在第4月：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
@@ -600,7 +1058,7 @@ public class GameServerDayVO {
      * 区服在第1年：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比
      */
     @ApiModelProperty(value = "区服第1年")
-    private GameServerTrendVO y1Trend;
+    private GameServerTrendVO m12Trend;
 
     /**
      * 区服至今：注册人数/创角人数/活跃人数/付费人数/付费金额/滚服人数/滚服付费人数/滚服付费金额/滚服付费占比

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

@@ -677,31 +677,386 @@ public class PitcherDataDayTotalVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private String amountM1;
+    private String amountD30;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第31日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private String amountM2;
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private String amountD31;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第32日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private String amountM3;
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private String amountD32;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第33日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
-    private String amountM6;
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private String amountD33;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private String amountD34;
+
+    /**
+     * 付费趋势第35日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private String amountD35;
+
+    /**
+     * 付费趋势第36日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private String amountD36;
+
+    /**
+     * 付费趋势第37日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private String amountD37;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private String amountD38;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private String amountD39;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private String amountD40;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private String amountD41;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private String amountD42;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private String amountD43;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private String amountD44;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private String amountD45;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private String amountD46;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private String amountD47;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private String amountD48;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第49日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private String amountY1;
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private String amountD49;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private String amountD50;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private String amountD51;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private String amountD52;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private String amountD53;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private String amountD54;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private String amountD55;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private String amountD56;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private String amountD57;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private String amountD58;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private String amountD59;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private String amountD60;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private String amountD61;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private String amountD62;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private String amountD63;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private String amountD64;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private String amountD65;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private String amountD66;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private String amountD67;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private String amountD68;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private String amountD69;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private String amountD70;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private String amountD71;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private String amountD72;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private String amountD73;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private String amountD74;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private String amountD75;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private String amountD76;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private String amountD77;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private String amountD78;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private String amountD79;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private String amountD80;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private String amountD81;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private String amountD82;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private String amountD83;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private String amountD84;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private String amountD85;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private String amountD86;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private String amountD87;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private String amountD88;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private String amountD89;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private String amountD90;
+
+    @ApiModelProperty(value = "付费趋势4月总：金额/人数/增/回/倍")
+    private String amountM4;
+    @ApiModelProperty(value = "付费趋势5月总：金额/人数/增/回/倍")
+    private String amountM5;
+    @ApiModelProperty(value = "付费趋势6月总：金额/人数/增/回/倍")
+    private String amountM6;
+    @ApiModelProperty(value = "付费趋势7月总：金额/人数/增/回/倍")
+    private String amountM7;
+    @ApiModelProperty(value = "付费趋势8月总：金额/人数/增/回/倍")
+    private String amountM8;
+    @ApiModelProperty(value = "付费趋势9月总：金额/人数/增/回/倍")
+    private String amountM9;
+    @ApiModelProperty(value = "付费趋势10月总：金额/人数/增/回/倍")
+    private String amountM10;
+    @ApiModelProperty(value = "付费趋势11月总：金额/人数/增/回/倍")
+    private String amountM11;
+    @ApiModelProperty(value = "付费趋势12月总：金额/人数/增/回/倍")
+    private String amountM12;
 
     /**
      * 付费趋势总：增/回/倍
@@ -1349,31 +1704,421 @@ public class PitcherDataDayTotalVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM1Trend;
+    private RechargeTrendVO amountD30Trend;
+
+    /**
+     * 付费趋势第31日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD31Trend;
+
+    /**
+     * 付费趋势第32日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD32Trend;
+
+    /**
+     * 付费趋势第33日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD33Trend;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD34Trend;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第35日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM2Trend;
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD35Trend;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第36日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM3Trend;
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD36Trend;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第37日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD37Trend;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD38Trend;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD39Trend;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD40Trend;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD41Trend;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD42Trend;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD43Trend;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD44Trend;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD45Trend;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD46Trend;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD47Trend;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD48Trend;
+
+    /**
+     * 付费趋势第49日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD49Trend;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD50Trend;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD51Trend;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD52Trend;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD53Trend;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD54Trend;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD55Trend;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD56Trend;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD57Trend;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD58Trend;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD59Trend;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD60Trend;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD61Trend;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD62Trend;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD63Trend;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD64Trend;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD65Trend;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD66Trend;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD67Trend;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD68Trend;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD69Trend;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD70Trend;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD71Trend;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD72Trend;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD73Trend;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD74Trend;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD75Trend;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD76Trend;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD77Trend;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD78Trend;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD79Trend;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD80Trend;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD81Trend;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD82Trend;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD83Trend;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD84Trend;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD85Trend;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD86Trend;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD87Trend;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD88Trend;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD89Trend;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD90Trend;
+
+    /**
+     * 付费趋势第4月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第4月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM4Trend;
+
+    /**
+     * 付费趋势第5月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第5月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM5Trend;
+
+    /**
+     * 付费趋势第6月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第6月总：金额/人数/增/回/倍")
     private RechargeTrendVO amountM6Trend;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第7月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第7月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM7Trend;
+
+    /**
+     * 付费趋势第8月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第8月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM8Trend;
+
+    /**
+     * 付费趋势第9月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第9月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM9Trend;
+
+    /**
+     * 付费趋势第10月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第10月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM10Trend;
+
+    /**
+     * 付费趋势第11月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第11月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM11Trend;
+
+    /**
+     * 付费趋势第12月总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountY1Trend;
+    @ApiModelProperty(value = "付费趋势第12月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM12Trend;
 
     /**
      * 付费趋势总：增/回/倍

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

@@ -702,31 +702,386 @@ public class PitcherDataDayVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private String amountM1;
+    private String amountD30;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第31日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private String amountM2;
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private String amountD31;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第32日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private String amountM3;
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private String amountD32;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第33日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
-    private String amountM6;
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private String amountD33;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private String amountD34;
+
+    /**
+     * 付费趋势第35日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private String amountD35;
+
+    /**
+     * 付费趋势第36日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private String amountD36;
+
+    /**
+     * 付费趋势第37日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private String amountD37;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private String amountD38;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private String amountD39;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private String amountD40;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private String amountD41;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private String amountD42;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private String amountD43;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private String amountD44;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private String amountD45;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private String amountD46;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private String amountD47;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private String amountD48;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第49日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private String amountY1;
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private String amountD49;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private String amountD50;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private String amountD51;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private String amountD52;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private String amountD53;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private String amountD54;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private String amountD55;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private String amountD56;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private String amountD57;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private String amountD58;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private String amountD59;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private String amountD60;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private String amountD61;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private String amountD62;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private String amountD63;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private String amountD64;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private String amountD65;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private String amountD66;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private String amountD67;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private String amountD68;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private String amountD69;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private String amountD70;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private String amountD71;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private String amountD72;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private String amountD73;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private String amountD74;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private String amountD75;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private String amountD76;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private String amountD77;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private String amountD78;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private String amountD79;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private String amountD80;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private String amountD81;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private String amountD82;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private String amountD83;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private String amountD84;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private String amountD85;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private String amountD86;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private String amountD87;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private String amountD88;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private String amountD89;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private String amountD90;
+
+    @ApiModelProperty(value = "付费趋势4月总：金额/人数/增/回/倍")
+    private String amountM4;
+    @ApiModelProperty(value = "付费趋势5月总：金额/人数/增/回/倍")
+    private String amountM5;
+    @ApiModelProperty(value = "付费趋势6月总：金额/人数/增/回/倍")
+    private String amountM6;
+    @ApiModelProperty(value = "付费趋势7月总：金额/人数/增/回/倍")
+    private String amountM7;
+    @ApiModelProperty(value = "付费趋势8月总：金额/人数/增/回/倍")
+    private String amountM8;
+    @ApiModelProperty(value = "付费趋势9月总：金额/人数/增/回/倍")
+    private String amountM9;
+    @ApiModelProperty(value = "付费趋势10月总：金额/人数/增/回/倍")
+    private String amountM10;
+    @ApiModelProperty(value = "付费趋势11月总：金额/人数/增/回/倍")
+    private String amountM11;
+    @ApiModelProperty(value = "付费趋势12月总：金额/人数/增/回/倍")
+    private String amountM12;
 
     /**
      * 付费趋势总：增/回/倍
@@ -1374,31 +1729,421 @@ public class PitcherDataDayVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM1Trend;
+    private RechargeTrendVO amountD30Trend;
+
+    /**
+     * 付费趋势第31日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD31Trend;
+
+    /**
+     * 付费趋势第32日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD32Trend;
+
+    /**
+     * 付费趋势第33日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD33Trend;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD34Trend;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第35日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM2Trend;
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD35Trend;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第36日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM3Trend;
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD36Trend;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第37日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD37Trend;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD38Trend;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD39Trend;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD40Trend;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD41Trend;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD42Trend;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD43Trend;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD44Trend;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD45Trend;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD46Trend;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD47Trend;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD48Trend;
+
+    /**
+     * 付费趋势第49日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD49Trend;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD50Trend;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD51Trend;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD52Trend;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD53Trend;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD54Trend;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD55Trend;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD56Trend;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD57Trend;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD58Trend;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD59Trend;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD60Trend;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD61Trend;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD62Trend;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD63Trend;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD64Trend;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD65Trend;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD66Trend;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD67Trend;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD68Trend;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD69Trend;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD70Trend;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD71Trend;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD72Trend;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD73Trend;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD74Trend;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD75Trend;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD76Trend;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD77Trend;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD78Trend;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD79Trend;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD80Trend;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD81Trend;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD82Trend;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD83Trend;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD84Trend;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD85Trend;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD86Trend;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD87Trend;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD88Trend;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD89Trend;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD90Trend;
+
+    /**
+     * 付费趋势第4月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第4月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM4Trend;
+
+    /**
+     * 付费趋势第5月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第5月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM5Trend;
+
+    /**
+     * 付费趋势第6月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第6月总：金额/人数/增/回/倍")
     private RechargeTrendVO amountM6Trend;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第7月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第7月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM7Trend;
+
+    /**
+     * 付费趋势第8月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第8月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM8Trend;
+
+    /**
+     * 付费趋势第9月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第9月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM9Trend;
+
+    /**
+     * 付费趋势第10月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第10月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM10Trend;
+
+    /**
+     * 付费趋势第11月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第11月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM11Trend;
+
+    /**
+     * 付费趋势第12月总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountY1Trend;
+    @ApiModelProperty(value = "付费趋势第12月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM12Trend;
 
     /**
      * 付费趋势总：增/回/倍

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

@@ -677,31 +677,386 @@ public class PitcherGameDataDayTotalVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private String amountM1;
+    private String amountD30;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第31日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private String amountM2;
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private String amountD31;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第32日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private String amountM3;
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private String amountD32;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第33日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
-    private String amountM6;
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private String amountD33;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private String amountD34;
+
+    /**
+     * 付费趋势第35日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private String amountD35;
+
+    /**
+     * 付费趋势第36日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private String amountD36;
+
+    /**
+     * 付费趋势第37日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private String amountD37;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private String amountD38;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private String amountD39;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private String amountD40;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private String amountD41;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private String amountD42;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private String amountD43;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private String amountD44;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private String amountD45;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private String amountD46;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private String amountD47;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private String amountD48;
+
+    /**
+     * 付费趋势第49日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private String amountD49;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private String amountD50;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private String amountD51;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private String amountD52;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private String amountD53;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private String amountD54;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private String amountD55;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private String amountD56;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private String amountD57;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private String amountD58;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private String amountD59;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private String amountD60;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private String amountD61;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private String amountD62;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private String amountD63;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private String amountD64;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private String amountD65;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private String amountD66;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private String amountD67;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private String amountD68;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private String amountD69;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private String amountD70;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private String amountD71;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private String amountD72;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private String amountD73;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private String amountD74;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private String amountD75;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private String amountD76;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private String amountD77;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private String amountD78;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private String amountD79;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private String amountD80;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private String amountD81;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private String amountD82;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private String amountD83;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private String amountD84;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private String amountD85;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private String amountD86;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private String amountD87;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private String amountD88;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private String amountD89;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第90日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private String amountY1;
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private String amountD90;
+
+    @ApiModelProperty(value = "付费趋势4月总：金额/人数/增/回/倍")
+    private String amountM4;
+    @ApiModelProperty(value = "付费趋势5月总：金额/人数/增/回/倍")
+    private String amountM5;
+    @ApiModelProperty(value = "付费趋势6月总：金额/人数/增/回/倍")
+    private String amountM6;
+    @ApiModelProperty(value = "付费趋势7月总：金额/人数/增/回/倍")
+    private String amountM7;
+    @ApiModelProperty(value = "付费趋势8月总：金额/人数/增/回/倍")
+    private String amountM8;
+    @ApiModelProperty(value = "付费趋势9月总：金额/人数/增/回/倍")
+    private String amountM9;
+    @ApiModelProperty(value = "付费趋势10月总：金额/人数/增/回/倍")
+    private String amountM10;
+    @ApiModelProperty(value = "付费趋势11月总：金额/人数/增/回/倍")
+    private String amountM11;
+    @ApiModelProperty(value = "付费趋势12月总：金额/人数/增/回/倍")
+    private String amountM12;
 
     /**
      * 付费趋势总：增/回/倍
@@ -1349,31 +1704,421 @@ public class PitcherGameDataDayTotalVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM1Trend;
+    private RechargeTrendVO amountD30Trend;
+
+    /**
+     * 付费趋势第31日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD31Trend;
+
+    /**
+     * 付费趋势第32日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD32Trend;
+
+    /**
+     * 付费趋势第33日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD33Trend;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD34Trend;
+
+    /**
+     * 付费趋势第35日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD35Trend;
+
+    /**
+     * 付费趋势第36日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD36Trend;
+
+    /**
+     * 付费趋势第37日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD37Trend;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD38Trend;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD39Trend;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD40Trend;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD41Trend;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD42Trend;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD43Trend;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD44Trend;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD45Trend;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD46Trend;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD47Trend;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD48Trend;
+
+    /**
+     * 付费趋势第49日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD49Trend;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD50Trend;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD51Trend;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD52Trend;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD53Trend;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD54Trend;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD55Trend;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD56Trend;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD57Trend;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD58Trend;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD59Trend;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD60Trend;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD61Trend;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD62Trend;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD63Trend;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD64Trend;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD65Trend;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第66日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM2Trend;
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD66Trend;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第67日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM3Trend;
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD67Trend;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第68日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD68Trend;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD69Trend;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD70Trend;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD71Trend;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD72Trend;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD73Trend;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD74Trend;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD75Trend;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD76Trend;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD77Trend;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD78Trend;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD79Trend;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD80Trend;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD81Trend;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD82Trend;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD83Trend;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD84Trend;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD85Trend;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD86Trend;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD87Trend;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD88Trend;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD89Trend;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD90Trend;
+
+    /**
+     * 付费趋势第4月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第4月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM4Trend;
+
+    /**
+     * 付费趋势第5月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第5月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM5Trend;
+
+    /**
+     * 付费趋势第6月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第6月总：金额/人数/增/回/倍")
     private RechargeTrendVO amountM6Trend;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第7月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第7月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM7Trend;
+
+    /**
+     * 付费趋势第8月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第8月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM8Trend;
+
+    /**
+     * 付费趋势第9月总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountY1Trend;
+    @ApiModelProperty(value = "付费趋势第9月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM9Trend;
+
+    /**
+     * 付费趋势第10月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第10月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM10Trend;
+
+    /**
+     * 付费趋势第11月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第11月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM11Trend;
+
+    /**
+     * 付费趋势第12月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第12月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM12Trend;
 
     /**
      * 付费趋势总：增/回/倍
@@ -1381,6 +2126,4 @@ public class PitcherGameDataDayTotalVO {
     @ApiModelProperty(value = "付费趋势总：增/回/倍")
     private RechargeTrendVO amountSumTrend;
 
-
-
 }

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

@@ -726,31 +726,386 @@ public class PitcherGameDataDayVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private String amountM1;
+    private String amountD30;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第31日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private String amountM2;
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private String amountD31;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第32日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private String amountM3;
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private String amountD32;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第33日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
-    private String amountM6;
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private String amountD33;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private String amountD34;
+
+    /**
+     * 付费趋势第35日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private String amountD35;
+
+    /**
+     * 付费趋势第36日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private String amountD36;
+
+    /**
+     * 付费趋势第37日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private String amountD37;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private String amountD38;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private String amountD39;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private String amountD40;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private String amountD41;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private String amountD42;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private String amountD43;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private String amountD44;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private String amountD45;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private String amountD46;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private String amountD47;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private String amountD48;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第49日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private String amountY1;
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private String amountD49;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private String amountD50;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private String amountD51;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private String amountD52;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private String amountD53;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private String amountD54;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private String amountD55;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private String amountD56;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private String amountD57;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private String amountD58;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private String amountD59;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private String amountD60;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private String amountD61;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private String amountD62;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private String amountD63;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private String amountD64;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private String amountD65;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private String amountD66;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private String amountD67;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private String amountD68;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private String amountD69;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private String amountD70;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private String amountD71;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private String amountD72;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private String amountD73;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private String amountD74;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private String amountD75;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private String amountD76;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private String amountD77;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private String amountD78;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private String amountD79;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private String amountD80;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private String amountD81;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private String amountD82;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private String amountD83;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private String amountD84;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private String amountD85;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private String amountD86;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private String amountD87;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private String amountD88;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private String amountD89;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private String amountD90;
+
+    @ApiModelProperty(value = "付费趋势4月总：金额/人数/增/回/倍")
+    private String amountM4;
+    @ApiModelProperty(value = "付费趋势5月总：金额/人数/增/回/倍")
+    private String amountM5;
+    @ApiModelProperty(value = "付费趋势6月总：金额/人数/增/回/倍")
+    private String amountM6;
+    @ApiModelProperty(value = "付费趋势7月总：金额/人数/增/回/倍")
+    private String amountM7;
+    @ApiModelProperty(value = "付费趋势8月总：金额/人数/增/回/倍")
+    private String amountM8;
+    @ApiModelProperty(value = "付费趋势9月总：金额/人数/增/回/倍")
+    private String amountM9;
+    @ApiModelProperty(value = "付费趋势10月总：金额/人数/增/回/倍")
+    private String amountM10;
+    @ApiModelProperty(value = "付费趋势11月总：金额/人数/增/回/倍")
+    private String amountM11;
+    @ApiModelProperty(value = "付费趋势12月总：金额/人数/增/回/倍")
+    private String amountM12;
 
     /**
      * 付费趋势总：增/回/倍
@@ -1398,31 +1753,421 @@ public class PitcherGameDataDayVO {
      * 付费趋势第30日总：金额/人数/增/回/倍
      */
     @ApiModelProperty(value = "付费趋势第30日总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM1Trend;
+    private RechargeTrendVO amountD30Trend;
+
+    /**
+     * 付费趋势第31日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第31日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD31Trend;
+
+    /**
+     * 付费趋势第32日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第32日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD32Trend;
+
+    /**
+     * 付费趋势第33日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第33日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD33Trend;
+
+    /**
+     * 付费趋势第34日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第34日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD34Trend;
 
     /**
-     * 付费趋势第二月总：金额/人数/增/回/倍
+     * 付费趋势第35日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第二月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM2Trend;
+    @ApiModelProperty(value = "付费趋势第35日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD35Trend;
 
     /**
-     * 付费趋势第三月总：金额/人数/增/回/倍
+     * 付费趋势第36日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势第三月总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountM3Trend;
+    @ApiModelProperty(value = "付费趋势第36日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD36Trend;
 
     /**
-     * 付费趋势六月总：金额/人数/增/回/倍
+     * 付费趋势第37日总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势六月总：金额/人数/增/回/倍")
+    @ApiModelProperty(value = "付费趋势第37日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD37Trend;
+
+    /**
+     * 付费趋势第38日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第38日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD38Trend;
+
+    /**
+     * 付费趋势第39日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第39日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD39Trend;
+
+    /**
+     * 付费趋势第40日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第40日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD40Trend;
+
+    /**
+     * 付费趋势第41日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第41日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD41Trend;
+
+    /**
+     * 付费趋势第42日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第42日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD42Trend;
+
+    /**
+     * 付费趋势第43日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第43日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD43Trend;
+
+    /**
+     * 付费趋势第44日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第44日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD44Trend;
+
+    /**
+     * 付费趋势第45日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第45日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD45Trend;
+
+    /**
+     * 付费趋势第46日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第46日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD46Trend;
+
+    /**
+     * 付费趋势第47日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第47日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD47Trend;
+
+    /**
+     * 付费趋势第48日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第48日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD48Trend;
+
+    /**
+     * 付费趋势第49日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第49日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD49Trend;
+
+    /**
+     * 付费趋势第50日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第50日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD50Trend;
+
+    /**
+     * 付费趋势第51日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第51日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD51Trend;
+
+    /**
+     * 付费趋势第52日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第52日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD52Trend;
+
+    /**
+     * 付费趋势第53日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第53日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD53Trend;
+
+    /**
+     * 付费趋势第54日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第54日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD54Trend;
+
+    /**
+     * 付费趋势第55日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第55日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD55Trend;
+
+    /**
+     * 付费趋势第56日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第56日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD56Trend;
+
+    /**
+     * 付费趋势第57日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第57日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD57Trend;
+
+    /**
+     * 付费趋势第58日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第58日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD58Trend;
+
+    /**
+     * 付费趋势第59日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第59日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD59Trend;
+
+    /**
+     * 付费趋势第60日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第60日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD60Trend;
+
+    /**
+     * 付费趋势第61日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第61日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD61Trend;
+
+    /**
+     * 付费趋势第62日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第62日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD62Trend;
+
+    /**
+     * 付费趋势第63日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第63日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD63Trend;
+
+    /**
+     * 付费趋势第64日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第64日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD64Trend;
+
+    /**
+     * 付费趋势第65日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第65日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD65Trend;
+
+    /**
+     * 付费趋势第66日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第66日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD66Trend;
+
+    /**
+     * 付费趋势第67日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第67日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD67Trend;
+
+    /**
+     * 付费趋势第68日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第68日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD68Trend;
+
+    /**
+     * 付费趋势第69日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第69日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD69Trend;
+
+    /**
+     * 付费趋势第70日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第70日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD70Trend;
+
+    /**
+     * 付费趋势第71日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第71日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD71Trend;
+
+    /**
+     * 付费趋势第72日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第72日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD72Trend;
+
+    /**
+     * 付费趋势第73日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第73日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD73Trend;
+
+    /**
+     * 付费趋势第74日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第74日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD74Trend;
+
+    /**
+     * 付费趋势第75日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第75日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD75Trend;
+
+    /**
+     * 付费趋势第76日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第76日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD76Trend;
+
+    /**
+     * 付费趋势第77日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第77日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD77Trend;
+
+    /**
+     * 付费趋势第78日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第78日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD78Trend;
+
+    /**
+     * 付费趋势第79日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第79日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD79Trend;
+
+    /**
+     * 付费趋势第80日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第80日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD80Trend;
+
+    /**
+     * 付费趋势第81日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第81日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD81Trend;
+
+    /**
+     * 付费趋势第82日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第82日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD82Trend;
+
+    /**
+     * 付费趋势第83日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第83日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD83Trend;
+
+    /**
+     * 付费趋势第84日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第84日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD84Trend;
+
+    /**
+     * 付费趋势第85日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第85日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD85Trend;
+
+    /**
+     * 付费趋势第86日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第86日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD86Trend;
+
+    /**
+     * 付费趋势第87日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第87日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD87Trend;
+
+    /**
+     * 付费趋势第88日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第88日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD88Trend;
+
+    /**
+     * 付费趋势第89日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第89日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD89Trend;
+
+    /**
+     * 付费趋势第90日总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第90日总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountD90Trend;
+
+    /**
+     * 付费趋势第4月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第4月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM4Trend;
+
+    /**
+     * 付费趋势第5月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第5月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM5Trend;
+
+    /**
+     * 付费趋势第6月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第6月总：金额/人数/增/回/倍")
     private RechargeTrendVO amountM6Trend;
 
     /**
-     * 付费趋势一年总：金额/人数/增/回/倍
+     * 付费趋势第7月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第7月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM7Trend;
+
+    /**
+     * 付费趋势第8月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第8月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM8Trend;
+
+    /**
+     * 付费趋势第9月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第9月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM9Trend;
+
+    /**
+     * 付费趋势第10月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第10月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM10Trend;
+
+    /**
+     * 付费趋势第11月总：金额/人数/增/回/倍
+     */
+    @ApiModelProperty(value = "付费趋势第11月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM11Trend;
+
+    /**
+     * 付费趋势第12月总：金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势一年总：金额/人数/增/回/倍")
-    private RechargeTrendVO amountY1Trend;
+    @ApiModelProperty(value = "付费趋势第12月总：金额/人数/增/回/倍")
+    private RechargeTrendVO amountM12Trend;
 
     /**
      * 付费趋势总：增/回/倍

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

@@ -121,6 +121,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay7(getRechargeTrendVO(item.getTrendDay7()));
         item.setRechargeTrendDay8(getRechargeTrendVO(item.getTrendDay8()));
         item.setRechargeTrendDay9(getRechargeTrendVO(item.getTrendDay9()));
+
         item.setRechargeTrendDay10(getRechargeTrendVO(item.getTrendDay10()));
         item.setRechargeTrendDay11(getRechargeTrendVO(item.getTrendDay11()));
         item.setRechargeTrendDay12(getRechargeTrendVO(item.getTrendDay12()));
@@ -131,6 +132,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay17(getRechargeTrendVO(item.getTrendDay17()));
         item.setRechargeTrendDay18(getRechargeTrendVO(item.getTrendDay18()));
         item.setRechargeTrendDay19(getRechargeTrendVO(item.getTrendDay19()));
+
         item.setRechargeTrendDay20(getRechargeTrendVO(item.getTrendDay20()));
         item.setRechargeTrendDay21(getRechargeTrendVO(item.getTrendDay21()));
         item.setRechargeTrendDay22(getRechargeTrendVO(item.getTrendDay22()));
@@ -142,11 +144,82 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay28(getRechargeTrendVO(item.getTrendDay28()));
         item.setRechargeTrendDay29(getRechargeTrendVO(item.getTrendDay29()));
 
-        item.setRechargeTrendMonth1(getRechargeTrendVO(item.getTrendMonth1()));
-        item.setRechargeTrendMonth2(getRechargeTrendVO(item.getTrendMonth2()));
-        item.setRechargeTrendMonth3(getRechargeTrendVO(item.getTrendMonth3()));
+        item.setRechargeTrendDay30(getRechargeTrendVO(item.getTrendDay30()));
+        item.setRechargeTrendDay31(getRechargeTrendVO(item.getTrendDay31()));
+        item.setRechargeTrendDay32(getRechargeTrendVO(item.getTrendDay32()));
+        item.setRechargeTrendDay33(getRechargeTrendVO(item.getTrendDay33()));
+        item.setRechargeTrendDay34(getRechargeTrendVO(item.getTrendDay34()));
+        item.setRechargeTrendDay35(getRechargeTrendVO(item.getTrendDay35()));
+        item.setRechargeTrendDay36(getRechargeTrendVO(item.getTrendDay36()));
+        item.setRechargeTrendDay37(getRechargeTrendVO(item.getTrendDay37()));
+        item.setRechargeTrendDay38(getRechargeTrendVO(item.getTrendDay38()));
+        item.setRechargeTrendDay39(getRechargeTrendVO(item.getTrendDay39()));
+
+        item.setRechargeTrendDay40(getRechargeTrendVO(item.getTrendDay40()));
+        item.setRechargeTrendDay41(getRechargeTrendVO(item.getTrendDay41()));
+        item.setRechargeTrendDay42(getRechargeTrendVO(item.getTrendDay42()));
+        item.setRechargeTrendDay43(getRechargeTrendVO(item.getTrendDay43()));
+        item.setRechargeTrendDay44(getRechargeTrendVO(item.getTrendDay44()));
+        item.setRechargeTrendDay45(getRechargeTrendVO(item.getTrendDay45()));
+        item.setRechargeTrendDay46(getRechargeTrendVO(item.getTrendDay46()));
+        item.setRechargeTrendDay47(getRechargeTrendVO(item.getTrendDay47()));
+        item.setRechargeTrendDay48(getRechargeTrendVO(item.getTrendDay48()));
+        item.setRechargeTrendDay49(getRechargeTrendVO(item.getTrendDay49()));
+
+        item.setRechargeTrendDay50(getRechargeTrendVO(item.getTrendDay50()));
+        item.setRechargeTrendDay51(getRechargeTrendVO(item.getTrendDay51()));
+        item.setRechargeTrendDay52(getRechargeTrendVO(item.getTrendDay52()));
+        item.setRechargeTrendDay53(getRechargeTrendVO(item.getTrendDay53()));
+        item.setRechargeTrendDay54(getRechargeTrendVO(item.getTrendDay54()));
+        item.setRechargeTrendDay55(getRechargeTrendVO(item.getTrendDay55()));
+        item.setRechargeTrendDay56(getRechargeTrendVO(item.getTrendDay56()));
+        item.setRechargeTrendDay57(getRechargeTrendVO(item.getTrendDay57()));
+        item.setRechargeTrendDay58(getRechargeTrendVO(item.getTrendDay58()));
+        item.setRechargeTrendDay59(getRechargeTrendVO(item.getTrendDay59()));
+
+        item.setRechargeTrendDay60(getRechargeTrendVO(item.getTrendDay60()));
+        item.setRechargeTrendDay61(getRechargeTrendVO(item.getTrendDay61()));
+        item.setRechargeTrendDay62(getRechargeTrendVO(item.getTrendDay62()));
+        item.setRechargeTrendDay63(getRechargeTrendVO(item.getTrendDay63()));
+        item.setRechargeTrendDay64(getRechargeTrendVO(item.getTrendDay64()));
+        item.setRechargeTrendDay65(getRechargeTrendVO(item.getTrendDay65()));
+        item.setRechargeTrendDay66(getRechargeTrendVO(item.getTrendDay66()));
+        item.setRechargeTrendDay67(getRechargeTrendVO(item.getTrendDay67()));
+        item.setRechargeTrendDay68(getRechargeTrendVO(item.getTrendDay68()));
+        item.setRechargeTrendDay69(getRechargeTrendVO(item.getTrendDay69()));
+
+        item.setRechargeTrendDay70(getRechargeTrendVO(item.getTrendDay70()));
+        item.setRechargeTrendDay71(getRechargeTrendVO(item.getTrendDay71()));
+        item.setRechargeTrendDay72(getRechargeTrendVO(item.getTrendDay72()));
+        item.setRechargeTrendDay73(getRechargeTrendVO(item.getTrendDay73()));
+        item.setRechargeTrendDay74(getRechargeTrendVO(item.getTrendDay74()));
+        item.setRechargeTrendDay75(getRechargeTrendVO(item.getTrendDay75()));
+        item.setRechargeTrendDay76(getRechargeTrendVO(item.getTrendDay76()));
+        item.setRechargeTrendDay77(getRechargeTrendVO(item.getTrendDay77()));
+        item.setRechargeTrendDay78(getRechargeTrendVO(item.getTrendDay78()));
+        item.setRechargeTrendDay79(getRechargeTrendVO(item.getTrendDay79()));
+
+        item.setRechargeTrendDay80(getRechargeTrendVO(item.getTrendDay80()));
+        item.setRechargeTrendDay81(getRechargeTrendVO(item.getTrendDay81()));
+        item.setRechargeTrendDay82(getRechargeTrendVO(item.getTrendDay82()));
+        item.setRechargeTrendDay83(getRechargeTrendVO(item.getTrendDay83()));
+        item.setRechargeTrendDay84(getRechargeTrendVO(item.getTrendDay84()));
+        item.setRechargeTrendDay85(getRechargeTrendVO(item.getTrendDay85()));
+        item.setRechargeTrendDay86(getRechargeTrendVO(item.getTrendDay86()));
+        item.setRechargeTrendDay87(getRechargeTrendVO(item.getTrendDay87()));
+        item.setRechargeTrendDay88(getRechargeTrendVO(item.getTrendDay88()));
+        item.setRechargeTrendDay89(getRechargeTrendVO(item.getTrendDay89()));
+        item.setRechargeTrendDay90(getRechargeTrendVO(item.getTrendDay90()));
+
+        item.setRechargeTrendMonth4(getRechargeTrendVO(item.getTrendMonth4()));
+        item.setRechargeTrendMonth5(getRechargeTrendVO(item.getTrendMonth5()));
         item.setRechargeTrendMonth6(getRechargeTrendVO(item.getTrendMonth6()));
-        item.setRechargeTrendYear1(getRechargeTrendVO(item.getTrendYear1()));
+        item.setRechargeTrendMonth7(getRechargeTrendVO(item.getTrendMonth7()));
+        item.setRechargeTrendMonth8(getRechargeTrendVO(item.getTrendMonth8()));
+        item.setRechargeTrendMonth9(getRechargeTrendVO(item.getTrendMonth9()));
+        item.setRechargeTrendMonth10(getRechargeTrendVO(item.getTrendMonth10()));
+        item.setRechargeTrendMonth11(getRechargeTrendVO(item.getTrendMonth11()));
+        item.setRechargeTrendMonth12(getRechargeTrendVO(item.getTrendMonth12()));
         item.setRechargeTrendTotal(getRechargeTrendVO(item.getTrendTotal()));
     }
 
@@ -229,6 +302,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay7(getSumRechargeTrendVO(item.getTrendDay7()));
         item.setRechargeTrendDay8(getSumRechargeTrendVO(item.getTrendDay8()));
         item.setRechargeTrendDay9(getSumRechargeTrendVO(item.getTrendDay9()));
+
         item.setRechargeTrendDay10(getSumRechargeTrendVO(item.getTrendDay10()));
         item.setRechargeTrendDay11(getSumRechargeTrendVO(item.getTrendDay11()));
         item.setRechargeTrendDay12(getSumRechargeTrendVO(item.getTrendDay12()));
@@ -239,6 +313,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay17(getSumRechargeTrendVO(item.getTrendDay17()));
         item.setRechargeTrendDay18(getSumRechargeTrendVO(item.getTrendDay18()));
         item.setRechargeTrendDay19(getSumRechargeTrendVO(item.getTrendDay19()));
+
         item.setRechargeTrendDay20(getSumRechargeTrendVO(item.getTrendDay20()));
         item.setRechargeTrendDay21(getSumRechargeTrendVO(item.getTrendDay21()));
         item.setRechargeTrendDay22(getSumRechargeTrendVO(item.getTrendDay22()));
@@ -250,11 +325,82 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         item.setRechargeTrendDay28(getSumRechargeTrendVO(item.getTrendDay28()));
         item.setRechargeTrendDay29(getSumRechargeTrendVO(item.getTrendDay29()));
 
-        item.setRechargeTrendMonth1(getSumRechargeTrendVO(item.getTrendMonth1()));
-        item.setRechargeTrendMonth2(getSumRechargeTrendVO(item.getTrendMonth2()));
-        item.setRechargeTrendMonth3(getSumRechargeTrendVO(item.getTrendMonth3()));
+        item.setRechargeTrendDay30(getSumRechargeTrendVO(item.getTrendDay30()));
+        item.setRechargeTrendDay31(getSumRechargeTrendVO(item.getTrendDay31()));
+        item.setRechargeTrendDay32(getSumRechargeTrendVO(item.getTrendDay32()));
+        item.setRechargeTrendDay33(getSumRechargeTrendVO(item.getTrendDay33()));
+        item.setRechargeTrendDay34(getSumRechargeTrendVO(item.getTrendDay34()));
+        item.setRechargeTrendDay35(getSumRechargeTrendVO(item.getTrendDay35()));
+        item.setRechargeTrendDay36(getSumRechargeTrendVO(item.getTrendDay36()));
+        item.setRechargeTrendDay37(getSumRechargeTrendVO(item.getTrendDay37()));
+        item.setRechargeTrendDay38(getSumRechargeTrendVO(item.getTrendDay38()));
+        item.setRechargeTrendDay39(getSumRechargeTrendVO(item.getTrendDay39()));
+
+        item.setRechargeTrendDay40(getSumRechargeTrendVO(item.getTrendDay40()));
+        item.setRechargeTrendDay41(getSumRechargeTrendVO(item.getTrendDay41()));
+        item.setRechargeTrendDay42(getSumRechargeTrendVO(item.getTrendDay42()));
+        item.setRechargeTrendDay43(getSumRechargeTrendVO(item.getTrendDay43()));
+        item.setRechargeTrendDay44(getSumRechargeTrendVO(item.getTrendDay44()));
+        item.setRechargeTrendDay45(getSumRechargeTrendVO(item.getTrendDay45()));
+        item.setRechargeTrendDay46(getSumRechargeTrendVO(item.getTrendDay46()));
+        item.setRechargeTrendDay47(getSumRechargeTrendVO(item.getTrendDay47()));
+        item.setRechargeTrendDay48(getSumRechargeTrendVO(item.getTrendDay48()));
+        item.setRechargeTrendDay49(getSumRechargeTrendVO(item.getTrendDay49()));
+
+        item.setRechargeTrendDay50(getSumRechargeTrendVO(item.getTrendDay50()));
+        item.setRechargeTrendDay51(getSumRechargeTrendVO(item.getTrendDay51()));
+        item.setRechargeTrendDay52(getSumRechargeTrendVO(item.getTrendDay52()));
+        item.setRechargeTrendDay53(getSumRechargeTrendVO(item.getTrendDay53()));
+        item.setRechargeTrendDay54(getSumRechargeTrendVO(item.getTrendDay54()));
+        item.setRechargeTrendDay55(getSumRechargeTrendVO(item.getTrendDay55()));
+        item.setRechargeTrendDay56(getSumRechargeTrendVO(item.getTrendDay56()));
+        item.setRechargeTrendDay57(getSumRechargeTrendVO(item.getTrendDay57()));
+        item.setRechargeTrendDay58(getSumRechargeTrendVO(item.getTrendDay58()));
+        item.setRechargeTrendDay59(getSumRechargeTrendVO(item.getTrendDay59()));
+
+        item.setRechargeTrendDay60(getSumRechargeTrendVO(item.getTrendDay60()));
+        item.setRechargeTrendDay61(getSumRechargeTrendVO(item.getTrendDay61()));
+        item.setRechargeTrendDay62(getSumRechargeTrendVO(item.getTrendDay62()));
+        item.setRechargeTrendDay63(getSumRechargeTrendVO(item.getTrendDay63()));
+        item.setRechargeTrendDay64(getSumRechargeTrendVO(item.getTrendDay64()));
+        item.setRechargeTrendDay65(getSumRechargeTrendVO(item.getTrendDay65()));
+        item.setRechargeTrendDay66(getSumRechargeTrendVO(item.getTrendDay66()));
+        item.setRechargeTrendDay67(getSumRechargeTrendVO(item.getTrendDay67()));
+        item.setRechargeTrendDay68(getSumRechargeTrendVO(item.getTrendDay68()));
+        item.setRechargeTrendDay69(getSumRechargeTrendVO(item.getTrendDay69()));
+
+        item.setRechargeTrendDay70(getSumRechargeTrendVO(item.getTrendDay70()));
+        item.setRechargeTrendDay71(getSumRechargeTrendVO(item.getTrendDay71()));
+        item.setRechargeTrendDay72(getSumRechargeTrendVO(item.getTrendDay72()));
+        item.setRechargeTrendDay73(getSumRechargeTrendVO(item.getTrendDay73()));
+        item.setRechargeTrendDay74(getSumRechargeTrendVO(item.getTrendDay74()));
+        item.setRechargeTrendDay75(getSumRechargeTrendVO(item.getTrendDay75()));
+        item.setRechargeTrendDay76(getSumRechargeTrendVO(item.getTrendDay76()));
+        item.setRechargeTrendDay77(getSumRechargeTrendVO(item.getTrendDay77()));
+        item.setRechargeTrendDay78(getSumRechargeTrendVO(item.getTrendDay78()));
+        item.setRechargeTrendDay79(getSumRechargeTrendVO(item.getTrendDay79()));
+
+        item.setRechargeTrendDay80(getSumRechargeTrendVO(item.getTrendDay80()));
+        item.setRechargeTrendDay81(getSumRechargeTrendVO(item.getTrendDay81()));
+        item.setRechargeTrendDay82(getSumRechargeTrendVO(item.getTrendDay82()));
+        item.setRechargeTrendDay83(getSumRechargeTrendVO(item.getTrendDay83()));
+        item.setRechargeTrendDay84(getSumRechargeTrendVO(item.getTrendDay84()));
+        item.setRechargeTrendDay85(getSumRechargeTrendVO(item.getTrendDay85()));
+        item.setRechargeTrendDay86(getSumRechargeTrendVO(item.getTrendDay86()));
+        item.setRechargeTrendDay87(getSumRechargeTrendVO(item.getTrendDay87()));
+        item.setRechargeTrendDay88(getSumRechargeTrendVO(item.getTrendDay88()));
+        item.setRechargeTrendDay89(getSumRechargeTrendVO(item.getTrendDay89()));
+        item.setRechargeTrendDay90(getSumRechargeTrendVO(item.getTrendDay90()));
+
+        item.setRechargeTrendMonth4(getSumRechargeTrendVO(item.getTrendMonth4()));
+        item.setRechargeTrendMonth5(getSumRechargeTrendVO(item.getTrendMonth5()));
         item.setRechargeTrendMonth6(getSumRechargeTrendVO(item.getTrendMonth6()));
-        item.setRechargeTrendYear1(getSumRechargeTrendVO(item.getTrendYear1()));
+        item.setRechargeTrendMonth7(getSumRechargeTrendVO(item.getTrendMonth7()));
+        item.setRechargeTrendMonth8(getSumRechargeTrendVO(item.getTrendMonth8()));
+        item.setRechargeTrendMonth9(getSumRechargeTrendVO(item.getTrendMonth9()));
+        item.setRechargeTrendMonth10(getSumRechargeTrendVO(item.getTrendMonth10()));
+        item.setRechargeTrendMonth11(getSumRechargeTrendVO(item.getTrendMonth11()));
+        item.setRechargeTrendMonth12(getSumRechargeTrendVO(item.getTrendMonth12()));
 
         String[] trendDayResult = item.getTrendTotal().split("/");
         BigDecimal dayTotalRecharge = new BigDecimal(trendDayResult[1]);
@@ -1213,11 +1359,76 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                        amount_d27 AS trend_day27,
                        amount_d28 AS trend_day28,
                        amount_d29 AS trend_day29,
-                       amount_m1 AS trend_month1,
-                       amount_m2 AS trend_month2,
-                       amount_m3 AS trend_month3,
+                       amount_d30 AS trend_day30,
+                       amount_d31 AS trend_day31,
+                       amount_d32 AS trend_day32,
+                       amount_d33 AS trend_day33,
+                       amount_d34 AS trend_day34,
+                       amount_d35 AS trend_day35,
+                       amount_d36 AS trend_day36,
+                       amount_d37 AS trend_day37,
+                       amount_d38 AS trend_day38,
+                       amount_d39 AS trend_day39,
+                       amount_d40 AS trend_day40,
+                       amount_d41 AS trend_day41,
+                       amount_d42 AS trend_day42,
+                       amount_d43 AS trend_day43,
+                       amount_d44 AS trend_day44,
+                       amount_d45 AS trend_day45,
+                       amount_d46 AS trend_day46,
+                       amount_d47 AS trend_day47,
+                       amount_d48 AS trend_day48,
+                       amount_d49 AS trend_day49,
+                       amount_d50 AS trend_day50,
+                       amount_d51 AS trend_day51,
+                       amount_d52 AS trend_day52,
+                       amount_d53 AS trend_day53,
+                       amount_d54 AS trend_day54,
+                       amount_d55 AS trend_day55,
+                       amount_d56 AS trend_day56,
+                       amount_d57 AS trend_day57,
+                       amount_d58 AS trend_day58,
+                       amount_d59 AS trend_day59,
+                       amount_d60 AS trend_day60,
+                       amount_d61 AS trend_day61,
+                       amount_d62 AS trend_day62,
+                       amount_d63 AS trend_day63,
+                       amount_d64 AS trend_day64,
+                       amount_d65 AS trend_day65,
+                       amount_d66 AS trend_day66,
+                       amount_d67 AS trend_day67,
+                       amount_d68 AS trend_day68,
+                       amount_d69 AS trend_day69,
+                       amount_d70 AS trend_day70,
+                       amount_d71 AS trend_day71,
+                       amount_d72 AS trend_day72,
+                       amount_d73 AS trend_day73,
+                       amount_d74 AS trend_day74,
+                       amount_d75 AS trend_day75,
+                       amount_d76 AS trend_day76,
+                       amount_d77 AS trend_day77,
+                       amount_d78 AS trend_day78,
+                       amount_d79 AS trend_day79,
+                       amount_d80 AS trend_day80,
+                       amount_d81 AS trend_day81,
+                       amount_d82 AS trend_day82,
+                       amount_d83 AS trend_day83,
+                       amount_d84 AS trend_day84,
+                       amount_d85 AS trend_day85,
+                       amount_d86 AS trend_day86,
+                       amount_d87 AS trend_day87,
+                       amount_d88 AS trend_day88,
+                       amount_d89 AS trend_day89,
+                       amount_d90 AS trend_day90,
+                       amount_m4 AS trend_month4,
+                       amount_m5 AS trend_month5,
                        amount_m6 AS trend_month6,
-                       amount_y1 AS trend_year1,
+                       amount_m7 AS trend_month7,
+                       amount_m8 AS trend_month8,
+                       amount_m9 AS trend_month9,
+                       amount_m10 AS trend_month10,
+                       amount_m11 AS trend_month11,
+                       amount_m12 AS trend_month12,
                        amount_sum AS trend_total,
                 	round(if(first_new_user_amount_count > 0, cost / first_new_user_amount_count, 0), 4) as first_recharge_count_cost,
                 	round(if(old_amount_count > 0, cost / old_amount_count, 0), 4) as old_user_recharge_count_cost,
@@ -1286,31 +1497,16 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	"""
                 +roiDay()+
                 """
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m2, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m3, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d30, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d60, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d90, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
                      round(if(SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m6, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day180,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_y1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m12, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
                      round(if(SUM(cost) > 0, sum(SPLIT_PART(amount_sum, '/', 6)) / SUM(cost), 0), 4) as roi_total,
                         """
                 +trendDay()+
-                        """
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_m1 , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m1, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m1, '/', 2) AS BIGINT)),'/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), '/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))) AS trend_month1,
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_m2 , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m2, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m2, '/', 2) AS BIGINT)),'/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), '/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))) AS trend_month2,
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_m3 , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m3, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m3, '/', 2) AS BIGINT)),'/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), '/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))) AS trend_month3,
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_m6 , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m6, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_m6, '/', 2) AS BIGINT)),'/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)), '/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))) AS trend_month6,
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_y1 , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_y1, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_y1, '/', 2) AS BIGINT)),'/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), '/',
-                            SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))) AS trend_year1,
-                         CONCAT(SUM(CAST(SPLIT_PART(amount_sum , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_sum, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_sum, '/', 2) AS BIGINT))) AS trend_total,
+                    """
+                    CONCAT(SUM(CAST(SPLIT_PART(amount_sum , '/', 1) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_sum, '/', 6) AS DECIMAL(10, 2))),'/',SUM(CAST(SPLIT_PART(amount_sum, '/', 2) AS BIGINT))) AS trend_total,
                     round(if(sum(register_num) > 0, sum(first_new_user_amount_num) / sum(register_num), 0), 4) as first_recharge_rate,
                     round(if(sum(register_num) > 0, sum(buy_new_user_total_amount_num) / sum(register_num), 0), 4) as buy_user_recharge_rate,
                     round(if(sum(amount_num) > 0, sum(first_new_user_amount_num) / sum(amount_num), 0), 4) as new_user_recharge_rate,
@@ -1341,7 +1537,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
     private String trendDay() {
         StringBuilder trendDay = new StringBuilder(StringUtils.EMPTY);
         LocalDate now = LocalDate.now();
-        for (int day = 1; day <= 29; day++) {
+        for (int day = 1; day <= 90; day++) {
             trendDay.append("""
                     CONCAT(
                         SUM(CAST(SPLIT_PART(amount_d%s , '/', 1) AS DECIMAL(10, 2))), '/',
@@ -1351,6 +1547,16 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                         SUM(IF(DATE_ADD(dt, INTERVAL %s DAY) > '%s', 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))
                     ) AS trend_day%s,""".formatted(day, day, day, day - 1, now,day-1,now,day));
         }
+        for (int month = 4; month <= 12; month++) {
+            trendDay.append("""
+                    CONCAT(
+                        SUM(CAST(SPLIT_PART(amount_m%s , '/', 1) AS DECIMAL(10, 2))), '/',
+                        SUM(CAST(SPLIT_PART(amount_m%s, '/', 6) AS DECIMAL(10, 2))), '/',
+                        SUM(CAST(SPLIT_PART(amount_m%s, '/', 2) AS BIGINT)), '/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s month) > '%s', 0, cost)), '/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s month) > '%s', 0, CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2))))
+                    ) AS trend_month%s,""".formatted(month, month, month, month, now,month,now,month));
+        }
         return trendDay.toString();
     }
 
@@ -1433,11 +1639,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                          """
                 +roiDay()+
                   """
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m2, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m3, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d30, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d60, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d90, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
                      round(if(SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m6, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day180,
-                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_y1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
+                     round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m12, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
                      round(if(SUM(cost) > 0, sum(SPLIT_PART(amount_sum, '/', 6)) / SUM(cost), 0), 4) as roi_total,
                  """
                 +
@@ -1527,11 +1733,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                          """
                 +roiDay()+
                 """
-                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
-                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m2, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
-                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m3, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
+                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d30, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 29 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day30,
+                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d60, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 59 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day60,
+                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_d90, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 89 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day90,
                    round(if(SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m6, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 179 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_day180,
-                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_y1, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
+                   round(if(SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)) > 0, sum(SPLIT_PART(amount_m12, '/', 6)) / SUM(IF(DATE_ADD(dt, INTERVAL 359 DAY) > CURRENT_DATE(), 0, cost)), 0), 4) as roi_year1,
                    round(if(SUM(cost) > 0, sum(SPLIT_PART(amount_sum, '/', 6)) / SUM(cost), 0), 4) as roi_total,
                """
                 +

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

@@ -298,60 +298,47 @@ public class GameServerServiceImpl implements IGameServerService {
      */
     private String trendDay() {
         StringBuilder daySql = new StringBuilder(StringUtils.EMPTY);
-        //拼接da1-da30 sql
-        for (int i = 1; i < 31; i++) {
+        //拼接da1-da90 sql
+        for (int i = 1; i <= 90; i++) {
             daySql.append("""
                     CONCAT(
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 1) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 2) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 3) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 4) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 5) AS DECIMAL(10,2))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 6) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 7) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(da%s, '/', 8) AS DECIMAL(10,2)))
+                    	SUM(SPLIT_PART(da%s, '/', 1)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 2)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 3)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 4)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 5)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 6)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 7)), '/',
+                    	SUM(SPLIT_PART(da%s, '/', 8))
                     ) as da%s ,
                     """.formatted(i, i, i, i, i, i, i, i, i));
         }
-        //拼接m2-m11 sql
-        for (int i = 2; i < 12; i++) {
+        //拼接m4-m12 sql
+        for (int i = 4; i <= 12; i++) {
             daySql.append("""
                     CONCAT(
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 1) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 2) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 3) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 4) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 5) AS DECIMAL(10,2))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 6) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 7) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(m%s, '/', 8) AS DECIMAL(10,2)))
+                    	SUM(SPLIT_PART(m%s, '/', 1)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 2)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 3)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 4)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 5)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 6)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 7)), '/',
+                    	SUM(SPLIT_PART(m%s, '/', 8))
                     ) as m%s ,
                     """.formatted(i, i, i, i, i, i, i, i, i));
         }
-        //拼接y1
-        daySql.append("""
-                    CONCAT(
-                    	SUM(CAST (SPLIT_PART(y1, '/', 1) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 2) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 3) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 4) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 5) AS DECIMAL(10,2))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 6) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 7) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(y1, '/', 8) AS DECIMAL(10,2)))
-                    ) as y1 ,
-                    """);
         //拼接total
         daySql.append("""
                     CONCAT(
-                    	SUM(CAST (SPLIT_PART(total, '/', 1) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 2) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 3) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 4) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 5) AS DECIMAL(10,2))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 6) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 7) AS BIGINT(20))), '/',
-                    	SUM(CAST (SPLIT_PART(total, '/', 8) AS DECIMAL(10,2)))
+                    	SUM(SPLIT_PART(total, '/', 1)), '/',
+                    	SUM(SPLIT_PART(total, '/', 2)), '/',
+                    	SUM(SPLIT_PART(total, '/', 3)), '/',
+                    	SUM(SPLIT_PART(total, '/', 4)), '/',
+                    	SUM(SPLIT_PART(total, '/', 5)), '/',
+                    	SUM(SPLIT_PART(total, '/', 6)), '/',
+                    	SUM(SPLIT_PART(total, '/', 7)), '/',
+                    	SUM(SPLIT_PART(total, '/', 8))
                     ) as total
                     """);
 
@@ -410,8 +397,66 @@ public class GameServerServiceImpl implements IGameServerService {
                     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,
@@ -420,7 +465,7 @@ public class GameServerServiceImpl implements IGameServerService {
                     m9,
                     m10,
                     m11,
-                    y1,
+                    m12,
                     total
                 FROM
                     game_ads.ads_game_server_day

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

@@ -1796,82 +1796,77 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     amount_d27,
                     amount_d28,
                     amount_d29,
-                    amount_m1,
-                    amount_m2,
-                    amount_m3,
+                    amount_d30,
+                    amount_d31,
+                    amount_d32,
+                    amount_d33,
+                    amount_d34,
+                    amount_d35,
+                    amount_d36,
+                    amount_d37,
+                    amount_d38,
+                    amount_d39,
+                    amount_d40,
+                    amount_d41,
+                    amount_d42,
+                    amount_d43,
+                    amount_d44,
+                    amount_d45,
+                    amount_d46,
+                    amount_d47,
+                    amount_d48,
+                    amount_d49,
+                    amount_d50,
+                    amount_d51,
+                    amount_d52,
+                    amount_d53,
+                    amount_d54,
+                    amount_d55,
+                    amount_d56,
+                    amount_d57,
+                    amount_d58,
+                    amount_d59,
+                    amount_d60,
+                    amount_d61,
+                    amount_d62,
+                    amount_d63,
+                    amount_d64,
+                    amount_d65,
+                    amount_d66,
+                    amount_d67,
+                    amount_d68,
+                    amount_d69,
+                    amount_d70,
+                    amount_d71,
+                    amount_d72,
+                    amount_d73,
+                    amount_d74,
+                    amount_d75,
+                    amount_d76,
+                    amount_d77,
+                    amount_d78,
+                    amount_d79,
+                    amount_d80,
+                    amount_d81,
+                    amount_d82,
+                    amount_d83,
+                    amount_d84,
+                    amount_d85,
+                    amount_d86,
+                    amount_d87,
+                    amount_d88,
+                    amount_d89,
+                    amount_d90,
+                    amount_m4,
+                    amount_m5,
                     amount_m6,
-                    amount_y1,
+                    amount_m7,
+                    amount_m8,
+                    amount_m9,
+                    amount_m10,
+                    amount_m11,
+                    amount_m12,
                     amount_sum,
-                    da1,
-                    da2,
-                    da3,
-                    da4,
-                    da5,
-                    da6,
-                    da7,
-                    da8,
-                    da9,
-                    da10,
-                    da11,
-                    da12,
-                    da13,
-                    da14,
-                    da15,
-                    da16,
-                    da17,
-                    da18,
-                    da19,
-                    da20,
-                    da21,
-                    da22,
-                    da23,
-                    da24,
-                    da25,
-                    da26,
-                    da27,
-                    da28,
-                    da29,
-                    da30,
-                    m2,
-                    m3,
-                    m6,
-                    y1,
-                    total,
-                    da1_num,
-                    da2_num,
-                    da3_num,
-                    da4_num,
-                    da5_num,
-                    da6_num,
-                    da7_num,
-                    da8_num,
-                    da9_num,
-                    da10_num,
-                    da11_num,
-                    da12_num,
-                    da13_num,
-                    da14_num,
-                    da15_num,
-                    da16_num,
-                    da17_num,
-                    da18_num,
-                    da19_num,
-                    da20_num,
-                    da21_num,
-                    da22_num,
-                    da23_num,
-                    da24_num,
-                    da25_num,
-                    da26_num,
-                    da27_num,
-                    da28_num,
-                    da29_num,
-                    da30_num,
-                    m2_num,
-                    m3_num,
-                    m6_num,
-                    y1_num,
-                    total_num,
                     first_role_cost,
                     new_user_total_role_cost,
                     role_num_cost,
@@ -2009,82 +2004,77 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     amount_d27,
                     amount_d28,
                     amount_d29,
-                    amount_m1,
-                    amount_m2,
-                    amount_m3,
+                    amount_d30,
+                    amount_d31,
+                    amount_d32,
+                    amount_d33,
+                    amount_d34,
+                    amount_d35,
+                    amount_d36,
+                    amount_d37,
+                    amount_d38,
+                    amount_d39,
+                    amount_d40,
+                    amount_d41,
+                    amount_d42,
+                    amount_d43,
+                    amount_d44,
+                    amount_d45,
+                    amount_d46,
+                    amount_d47,
+                    amount_d48,
+                    amount_d49,
+                    amount_d50,
+                    amount_d51,
+                    amount_d52,
+                    amount_d53,
+                    amount_d54,
+                    amount_d55,
+                    amount_d56,
+                    amount_d57,
+                    amount_d58,
+                    amount_d59,
+                    amount_d60,
+                    amount_d61,
+                    amount_d62,
+                    amount_d63,
+                    amount_d64,
+                    amount_d65,
+                    amount_d66,
+                    amount_d67,
+                    amount_d68,
+                    amount_d69,
+                    amount_d70,
+                    amount_d71,
+                    amount_d72,
+                    amount_d73,
+                    amount_d74,
+                    amount_d75,
+                    amount_d76,
+                    amount_d77,
+                    amount_d78,
+                    amount_d79,
+                    amount_d80,
+                    amount_d81,
+                    amount_d82,
+                    amount_d83,
+                    amount_d84,
+                    amount_d85,
+                    amount_d86,
+                    amount_d87,
+                    amount_d88,
+                    amount_d89,
+                    amount_d90,
+                    amount_m4,
+                    amount_m5,
                     amount_m6,
-                    amount_y1,
+                    amount_m7,
+                    amount_m8,
+                    amount_m9,
+                    amount_m10,
+                    amount_m11,
+                    amount_m12,
                     amount_sum,
-                    da1,
-                    da2,
-                    da3,
-                    da4,
-                    da5,
-                    da6,
-                    da7,
-                    da8,
-                    da9,
-                    da10,
-                    da11,
-                    da12,
-                    da13,
-                    da14,
-                    da15,
-                    da16,
-                    da17,
-                    da18,
-                    da19,
-                    da20,
-                    da21,
-                    da22,
-                    da23,
-                    da24,
-                    da25,
-                    da26,
-                    da27,
-                    da28,
-                    da29,
-                    da30,
-                    m2,
-                    m3,
-                    m6,
-                    y1,
-                    total,
-                    da1_num,
-                    da2_num,
-                    da3_num,
-                    da4_num,
-                    da5_num,
-                    da6_num,
-                    da7_num,
-                    da8_num,
-                    da9_num,
-                    da10_num,
-                    da11_num,
-                    da12_num,
-                    da13_num,
-                    da14_num,
-                    da15_num,
-                    da16_num,
-                    da17_num,
-                    da18_num,
-                    da19_num,
-                    da20_num,
-                    da21_num,
-                    da22_num,
-                    da23_num,
-                    da24_num,
-                    da25_num,
-                    da26_num,
-                    da27_num,
-                    da28_num,
-                    da29_num,
-                    da30_num,
-                    m2_num,
-                    m3_num,
-                    m6_num,
-                    y1_num,
-                    total_num,
                     first_role_cost,
                     new_user_total_role_cost,
                     role_num_cost,
@@ -2187,81 +2177,11 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     ROUND(IF(SUM(cost) > 0 , SUM(da28) / SUM(cost), 0), 4) as roi28,
                     ROUND(IF(SUM(cost) > 0 , SUM(da29) / SUM(cost), 0), 4) as roi29,
                     ROUND(IF(SUM(cost) > 0 , SUM(da30) / SUM(cost), 0), 4) as roi30,
-                    ROUND(IF(SUM(cost) > 0 , SUM(m2) / SUM(cost), 0), 4) as roi60,
-                    ROUND(IF(SUM(cost) > 0 , SUM(m3) / SUM(cost), 0), 4) as roi90,
+                    ROUND(IF(SUM(cost) > 0 , SUM(da60) / SUM(cost), 0), 4) as roi60,
+                    ROUND(IF(SUM(cost) > 0 , SUM(da90) / SUM(cost), 0), 4) as roi90,
                     ROUND(IF(SUM(cost) > 0 , SUM(m6) / SUM(cost), 0), 4) as roi180,
-                    ROUND(IF(SUM(cost) > 0 , SUM(y1) / SUM(cost), 0), 4) as roi1yaer,
+                    ROUND(IF(SUM(cost) > 0 , SUM(m12) / SUM(cost), 0), 4) as roi1yaer,
                     ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total,
-                    SUM(da1) as da1,
-                    SUM(da2) as da2,
-                    SUM(da3) as da3,
-                    SUM(da4) as da4,
-                    SUM(da5) as da5,
-                    SUM(da6) as da6,
-                    SUM(da7) as da7,
-                    SUM(da8) as da8,
-                    SUM(da9) as da9,
-                    SUM(da10) as da10,
-                    SUM(da11) as da11,
-                    SUM(da12) as da12,
-                    SUM(da13) as da13,
-                    SUM(da14) as da14,
-                    SUM(da15) as da15,
-                    SUM(da16) as da16,
-                    SUM(da17) as da17,
-                    SUM(da18) as da18,
-                    SUM(da19) as da19,
-                    SUM(da20) as da20,
-                    SUM(da21) as da21,
-                    SUM(da22) as da22,
-                    SUM(da23) as da23,
-                    SUM(da24) as da24,
-                    SUM(da25) as da25,
-                    SUM(da26) as da26,
-                    SUM(da27) as da27,
-                    SUM(da28) as da28,
-                    SUM(da29) as da29,
-                    SUM(da30) as da30,
-                    SUM(m2) as m2,
-                    SUM(m3) as m3,
-                    SUM(m6) as m6,
-                    SUM(y1) as y1,
-                    SUM(total) as total,
-                    SUM(da1_num) as da1_num,
-                    SUM(da2_num) as da2_num,
-                    SUM(da3_num) as da3_num,
-                    SUM(da4_num) as da4_num,
-                    SUM(da5_num) as da5_num,
-                    SUM(da6_num) as da6_num,
-                    SUM(da7_num) as da7_num,
-                    SUM(da8_num) as da8_num,
-                    SUM(da9_num) as da9_num,
-                    SUM(da10_num) as da10_num,
-                    SUM(da11_num) as da11_num,
-                    SUM(da12_num) as da12_num,
-                    SUM(da13_num) as da13_num,
-                    SUM(da14_num) as da14_num,
-                    SUM(da15_num) as da15_num,
-                    SUM(da16_num) as da16_num,
-                    SUM(da17_num) as da17_num,
-                    SUM(da18_num) as da18_num,
-                    SUM(da19_num) as da19_num,
-                    SUM(da20_num) as da20_num,
-                    SUM(da21_num) as da21_num,
-                    SUM(da22_num) as da22_num,
-                    SUM(da23_num) as da23_num,
-                    SUM(da24_num) as da24_num,
-                    SUM(da25_num) as da25_num,
-                    SUM(da26_num) as da26_num,
-                    SUM(da27_num) as da27_num,
-                    SUM(da28_num) as da28_num,
-                    SUM(da29_num) as da29_num,
-                    SUM(da30_num) as da30_num,
-                    SUM(m2_num) as m2_num,
-                    SUM(m3_num) as m3_num,
-                    SUM(m6_num) as m6_num,
-                    SUM(y1_num) as y1_num,
-                    SUM(total_num) as total_num,
                 """ + getPitcherGameDataDayTotalDayNsql() +
                 """
                 FROM
@@ -2359,81 +2279,11 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     ROUND(IF(SUM(cost) > 0 , SUM(da28) / SUM(cost), 0), 4) as roi28,
                     ROUND(IF(SUM(cost) > 0 , SUM(da29) / SUM(cost), 0), 4) as roi29,
                     ROUND(IF(SUM(cost) > 0 , SUM(da30) / SUM(cost), 0), 4) as roi30,
-                    ROUND(IF(SUM(cost) > 0 , SUM(m2) / SUM(cost), 0), 4) as roi60,
-                    ROUND(IF(SUM(cost) > 0 , SUM(m3) / SUM(cost), 0), 4) as roi90,
+                    ROUND(IF(SUM(cost) > 0 , SUM(da60) / SUM(cost), 0), 4) as roi60,
+                    ROUND(IF(SUM(cost) > 0 , SUM(da90) / SUM(cost), 0), 4) as roi90,
                     ROUND(IF(SUM(cost) > 0 , SUM(m6) / SUM(cost), 0), 4) as roi180,
-                    ROUND(IF(SUM(cost) > 0 , SUM(y1) / SUM(cost), 0), 4) as roi1yaer,
+                    ROUND(IF(SUM(cost) > 0 , SUM(m12) / SUM(cost), 0), 4) as roi1yaer,
                     ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total,
-                    SUM(da1) as da1,
-                    SUM(da2) as da2,
-                    SUM(da3) as da3,
-                    SUM(da4) as da4,
-                    SUM(da5) as da5,
-                    SUM(da6) as da6,
-                    SUM(da7) as da7,
-                    SUM(da8) as da8,
-                    SUM(da9) as da9,
-                    SUM(da10) as da10,
-                    SUM(da11) as da11,
-                    SUM(da12) as da12,
-                    SUM(da13) as da13,
-                    SUM(da14) as da14,
-                    SUM(da15) as da15,
-                    SUM(da16) as da16,
-                    SUM(da17) as da17,
-                    SUM(da18) as da18,
-                    SUM(da19) as da19,
-                    SUM(da20) as da20,
-                    SUM(da21) as da21,
-                    SUM(da22) as da22,
-                    SUM(da23) as da23,
-                    SUM(da24) as da24,
-                    SUM(da25) as da25,
-                    SUM(da26) as da26,
-                    SUM(da27) as da27,
-                    SUM(da28) as da28,
-                    SUM(da29) as da29,
-                    SUM(da30) as da30,
-                    SUM(m2) as m2,
-                    SUM(m3) as m3,
-                    SUM(m6) as m6,
-                    SUM(y1) as y1,
-                    SUM(total) as total,
-                    SUM(da1_num) as da1_num,
-                    SUM(da2_num) as da2_num,
-                    SUM(da3_num) as da3_num,
-                    SUM(da4_num) as da4_num,
-                    SUM(da5_num) as da5_num,
-                    SUM(da6_num) as da6_num,
-                    SUM(da7_num) as da7_num,
-                    SUM(da8_num) as da8_num,
-                    SUM(da9_num) as da9_num,
-                    SUM(da10_num) as da10_num,
-                    SUM(da11_num) as da11_num,
-                    SUM(da12_num) as da12_num,
-                    SUM(da13_num) as da13_num,
-                    SUM(da14_num) as da14_num,
-                    SUM(da15_num) as da15_num,
-                    SUM(da16_num) as da16_num,
-                    SUM(da17_num) as da17_num,
-                    SUM(da18_num) as da18_num,
-                    SUM(da19_num) as da19_num,
-                    SUM(da20_num) as da20_num,
-                    SUM(da21_num) as da21_num,
-                    SUM(da22_num) as da22_num,
-                    SUM(da23_num) as da23_num,
-                    SUM(da24_num) as da24_num,
-                    SUM(da25_num) as da25_num,
-                    SUM(da26_num) as da26_num,
-                    SUM(da27_num) as da27_num,
-                    SUM(da28_num) as da28_num,
-                    SUM(da29_num) as da29_num,
-                    SUM(da30_num) as da30_num,
-                    SUM(m2_num) as m2_num,
-                    SUM(m3_num) as m3_num,
-                    SUM(m6_num) as m6_num,
-                    SUM(y1_num) as y1_num,
-                    SUM(total_num) as total_num,
                 """ + getPitcherGameDataDayTotalDayNsql() +
                 """
                 FROM
@@ -2447,59 +2297,35 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
      */
     private String getPitcherGameDataDayTotalDayNsql() {
         StringBuilder totalDayN = new StringBuilder(StringUtils.EMPTY);
-        for (int day = 1; day <= 29 ; day++) {
+        for (int day = 1; day <= 90 ; day++) {
             totalDayN.append("""
                     CONCAT(
-                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now() , CAST(SPLIT_PART(amount_d%s , '/', 1) AS DECIMAL(10, 2)), 0 )),'/',
-                        SUM(CAST(SPLIT_PART(amount_d%s, '/', 6) AS DECIMAL(10, 2))),'/',
-                        SUM(CAST(SPLIT_PART(amount_d%s, '/', 2) AS BIGINT)),'/',
-                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now(),  cost, 0)),'/',
-                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now(),  CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now(), SPLIT_PART(amount_d%s , '/', 1), 0)),'/',
+                        SUM(SPLIT_PART(amount_d%s, '/', 6)),'/',
+                        SUM(SPLIT_PART(amount_d%s, '/', 2)),'/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now(), cost, 0)),'/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s day) <= LocalDate.now(), SPLIT_PART(amount_d1 , '/', 1), 0))
                     ) AS amount_d%s ,
                        """.formatted(day - 1, day, day, day, day - 1, day - 1, day));
         }
+        for (int month = 4; month <= 12 ; month ++) {
+            totalDayN.append("""
+                    CONCAT(
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s month) <= LocalDate.now(), SPLIT_PART(amount_m%s , '/', 1), 0)),'/',
+                        SUM(SPLIT_PART(amount_m%s, '/', 6)),'/',
+                        SUM(SPLIT_PART(amount_m%s, '/', 2)),'/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s month) <= LocalDate.now(), cost, 0)),'/',
+                        SUM(IF(DATE_ADD(dt, INTERVAL %s month) <= LocalDate.now(), SPLIT_PART(amount_d1 , '/', 1), 0))
+                    ) AS amount_m%s ,
+                       """.formatted(month, month, month, month, month, month, month));
+        }
         totalDayN.append("""
                 CONCAT(
-                    SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= LocalDate.now() , CAST(SPLIT_PART(amount_m1 , '/', 1) AS DECIMAL(10, 2)), 0 )), '/',
-                    SUM(CAST(SPLIT_PART(amount_m1, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_m1, '/', 2) AS BIGINT)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= LocalDate.now(), cost, 0)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 29 day) <= LocalDate.now(), CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
-                ) AS amount_m1,
-                CONCAT(
-                    SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now() , CAST(SPLIT_PART(amount_m2 , '/', 1) AS DECIMAL(10, 2)), 0 )), '/',
-                    SUM(CAST(SPLIT_PART(amount_m2, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_m2, '/', 2) AS BIGINT)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
-                    ) AS amount_m2,
-                CONCAT(
-                    SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now() , CAST(SPLIT_PART(amount_m3 , '/', 1) AS DECIMAL(10, 2)), 0 )), '/',
-                    SUM(CAST(SPLIT_PART(amount_m3, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_m3, '/', 2) AS BIGINT)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
-                    ) AS amount_m3,
-                CONCAT(
-                    SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now() , CAST(SPLIT_PART(amount_m6 , '/', 1) AS DECIMAL(10, 2)), 0 )), '/',
-                    SUM(CAST(SPLIT_PART(amount_m6, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_m6, '/', 2) AS BIGINT)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
-                    ) AS amount_m6,
-                CONCAT(
-                    SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now() , CAST(SPLIT_PART(amount_y1 , '/', 1) AS DECIMAL(10, 2)), 0 )), '/',
-                    SUM(CAST(SPLIT_PART(amount_y1, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_y1, '/', 2) AS BIGINT)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), '/',
-                    SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)) , 0))
-                    ) AS amount_y1,
-                CONCAT(
-                    SUM(CAST(SPLIT_PART(amount_sum , '/', 1) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_sum, '/', 6) AS DECIMAL(10, 2))), '/',
-                    SUM(CAST(SPLIT_PART(amount_sum, '/', 2) AS BIGINT)), '/',
+                    SUM(SPLIT_PART(amount_sum, '/', 1)), '/',
+                    SUM(SPLIT_PART(amount_sum, '/', 6)), '/',
+                    SUM(SPLIT_PART(amount_sum, '/', 2)), '/',
                     SUM(cost), '/',
-                    SUM(CAST(SPLIT_PART(amount_d1 , '/', 1) AS DECIMAL(10, 2)))
+                    SUM(SPLIT_PART(amount_d1 , '/', 1))
                     ) AS amount_sum
                 """);
         //返回结果
@@ -2581,13 +2407,13 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                 		""" + pitcherDataTotalRoiSql() +
                         """
                     	ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                            SUM(m2) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
+                            SUM(da60) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
                     	ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                            SUM(m3) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
+                            SUM(da90) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)) > 0 ,
                             SUM(m6) / SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi180,
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)) > 0 ,
-                            SUM(y1) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
+                            SUM(m12) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
                     	ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total
                     FROM
                     	game_ads.ads_pitcher_day
@@ -2664,7 +2490,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
     }
 
     /**
-     * 投手总数据的每日roi计算sql(投手总数据和投手总数据总计使用)
+     * 投手总数据的每日roi计算sql(投手总数据和投手总数据总计使用、投手游戏总数据和投手游戏总数据总计使用)
      * @return String
      */
     private String pitcherDataTotalRoiSql() {
@@ -2757,13 +2583,13 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                 		""" + pitcherDataTotalRoiSql() +
                         """
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                              SUM(m2) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
+                              SUM(da60) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                              SUM(m3) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
+                              SUM(da90) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)) > 0 ,
                               SUM(m6) / SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi180,
                         ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)) > 0 ,
-                              SUM(y1) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
+                              SUM(m12) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
                         ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total
                     FROM
                     	game_ads.ads_game_pitcher_day
@@ -2899,13 +2725,13 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     """ + pitcherDataTotalRoiSql() +
                     """
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(m2) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
+                          SUM(da60) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(m3) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
+                          SUM(da90) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)) > 0 ,
                           SUM(m6) / SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi180,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(y1) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
+                          SUM(m12) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
                     ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total
                 FROM
                     game_ads.ads_pitcher_day
@@ -2964,13 +2790,13 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     """ + pitcherDataTotalRoiSql() +
                     """
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(m2) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
+                          SUM(da60) / SUM(IF(DATE_ADD(dt, INTERVAL 59 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi60,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(m3) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
+                          SUM(da90) / SUM(IF(DATE_ADD(dt, INTERVAL 89 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi90,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)) > 0 ,
                           SUM(m6) / SUM(IF(DATE_ADD(dt, INTERVAL 179 day) <= LocalDate.now(), cost, 0)), 0), 4) as roi180,
                     ROUND(IF(SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)) > 0 ,
-                          SUM(y1) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
+                          SUM(m12) / SUM(IF(DATE_ADD(dt, INTERVAL 1 year) <= LocalDate.now(), cost, 0)), 0), 4) as roi1yaer,
                     ROUND(IF(SUM(cost) > 0 , SUM(total) / SUM(cost), 0), 4) as roi_total
                 FROM
                     game_ads.ads_game_pitcher_day

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <解决bug调试修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <解决bug调试修改1> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthRoleServiceImpl.java

@@ -16,11 +16,15 @@ import com.zanxiang.game.module.manage.pojo.params.GameAuthRoleListParam;
 import com.zanxiang.game.module.manage.pojo.params.GameAuthRoleUpdateParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameAuthRoleVO;
 import com.zanxiang.game.module.manage.service.IGameAuthRoleService;
+import com.zanxiang.game.module.manage.service.IGameAuthService;
+import com.zanxiang.game.module.mybatis.entity.GameAuth;
 import com.zanxiang.game.module.mybatis.entity.GameAuthRole;
 import com.zanxiang.game.module.mybatis.mapper.GameAuthRoleMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
+import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +44,9 @@ public class GameAuthRoleServiceImpl extends ServiceImpl<GameAuthRoleMapper, Gam
     @DubboReference(providedBy = ErpServer.SERVER_DUBBO_NAME)
     private ISysUserRpc sysUserRpc;
 
+    @Autowired
+    private IGameAuthService gameAuthService;
+
     @Override
     public Map<Long, String> getUserByAuthType(String authType) {
         List<GameAuthRole> authRoleList = super.list(new LambdaQueryWrapper<GameAuthRole>()
@@ -96,6 +103,16 @@ public class GameAuthRoleServiceImpl extends ServiceImpl<GameAuthRoleMapper, Gam
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteById(Long id) {
+        //查询用户是否存在游戏
+        GameAuthRole gameAuthRole = super.getById(id);
+        if (gameAuthRole == null) {
+            return false;
+        }
+        if (gameAuthService.count(new LambdaQueryWrapper<GameAuth>()
+                .eq(GameAuth::getUserId, gameAuthRole.getUserId())
+        ) > 0) {
+            throw new BaseException("该角色存在分配的游戏, 禁止删除");
+        }
         return super.removeById(id);
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthServiceImpl.java

@@ -142,7 +142,9 @@ public class GameAuthServiceImpl extends ServiceImpl<GameAuthMapper, GameAuth> i
         gameAuthVO.setUserName(userMap.get(gameAuthVO.getUserId()));
         GameAuthRole gameAuthRole = gameAuthRoleService.getOne(new LambdaQueryWrapper<GameAuthRole>()
                 .eq(GameAuthRole::getUserId, gameAuthVO.getUserId()));
-        gameAuthVO.setAuthType(GameAuthEnum.getByValue(gameAuthRole.getAuthType()));
+        if (gameAuthRole != null) {
+            gameAuthVO.setAuthType(GameAuthEnum.getByValue(gameAuthRole.getAuthType()));
+        }
         return gameAuthVO;
     }