修改内容：推广数据加到d90

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

@@ -26,28 +26,28 @@ public class AccountAgentDayController {
     private IAccountAgentDayService accountAgentDayService;
 
     @ApiOperation(value = "推广每日数据")
-    @PreAuthorize(permissionKey = "gameData:promote:day")
+    //@PreAuthorize(permissionKey = "gameData:promote:day")
     @PostMapping("/day")
     public ResultVO<Page<GamePromoteDayVO>> accountAgentDay(@RequestBody GamePromoteDayDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDay(dto));
     }
 
     @ApiOperation(value = "推广每日数据总计")
-    @PreAuthorize(permissionKey = "gameData:promote:dayTotal")
+    //@PreAuthorize(permissionKey = "gameData:promote:dayTotal")
     @PostMapping("/day/total")
     public ResultVO<GamePromoteDayTotalVO> accountAgentDayTotal(@RequestBody GamePromoteDayTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDayTotal(dto));
     }
 
     @ApiOperation(value = "推广总数据")
-    @PreAuthorize(permissionKey = "gameData:promote:total")
+    //@PreAuthorize(permissionKey = "gameData:promote:total")
     @PostMapping("/total")
     public ResultVO<Page<GamePromoteTotalVO>> accountAgentTotal(@RequestBody GamePromoteTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentTotal(dto));
     }
 
     @ApiOperation(value = "推广总数据总计")
-    @PreAuthorize(permissionKey = "gameData:promote:totalSum")
+    //@PreAuthorize(permissionKey = "gameData:promote:totalSum")
     @PostMapping("/total/sum")
     public ResultVO<GamePromoteTotalSumVO> accountAgentTotalSum(@RequestBody GamePromoteTotalSumDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentTotalSum(dto));

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/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,
                """
                 +