修改内容：修改付费趋势

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

@@ -1,6 +1,5 @@
 package com.zanxiang.game.data.serve.controller;
 
-import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.data.serve.pojo.dto.GameDataDayDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GameDataTotalDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GameDataWaterDTO;
@@ -36,7 +35,7 @@ public class GameDataController {
     private IGameDataService gameDataService;
 
     @ApiOperation(value = "游戏每日数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:day")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:day")
     @PostMapping("/day")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<Page<GameDataDayVO>> getGameDataDay(@RequestBody GameDataDayDTO dto) {
@@ -45,7 +44,7 @@ public class GameDataController {
 
 
     @ApiOperation(value = "游戏总数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:total")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:total")
     @PostMapping("/total")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataTotalVO.class)})
     public ResultVO<Page<GameDataTotalVO>> getGameDataTotal(@RequestBody GameDataTotalDTO dto) {

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsAccountAgentDay.java

@@ -490,6 +490,12 @@ public class AdsAccountAgentDay implements Serializable {
     @Column
     private String amountD3;
 
+    /**
+     * 付费趋势第五天总：增/回/倍
+     */
+    @Column
+    private String amountD5;
+
     /**
      * 付费趋势第七天总：增/回/倍
      */
@@ -520,6 +526,12 @@ public class AdsAccountAgentDay implements Serializable {
     @Column
     private String amountM3;
 
+    /**
+     * 付费趋势第六月总：增/回/倍
+     */
+    @Column
+    private String amountM6;
+
     /**
      * 付费趋势总：增/回/倍
      */

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

@@ -472,183 +472,364 @@ public class GameDataDayVO {
     private BigDecimal amountArpu;
 
     /**
-     * 付费趋势：1天（买量）金额/人数/增/回/倍
+     * 付费趋势：1天（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1天（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1天（买量）金额/人数/增/回/倍")
     private String buyAmountD1;
 
     /**
-     * 付费趋势：3天（买量）金额/人数/增/回/倍
+     * 付费趋势：3天（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3天（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3天（买量）金额/人数/增/回/倍")
     private String buyAmountD3;
 
     /**
      * 付费趋势：5天（买量）金额/人数/增/回/倍
      */
-    @ApiModelProperty(value = "付费趋势：5天（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：5天（买量）金额/人数/增/回/倍")
     private String buyAmountD5;
 
     /**
-     * 付费趋势：7天（买量）金额/人数/增/回/倍
+     * 付费趋势：7天（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：7天（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：7天（买量）金额/人数/增/回/倍")
     private String buyAmountD7;
 
     /**
-     * 付费趋势：15天（买量）金额/人数/增/回/倍
+     * 付费趋势：15天（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：15天（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：15天（买量）金额/人数/增/回/倍")
     private String buyAmountD15;
 
     /**
-     * 付费趋势：1个月（买量）金额/人数/增/回/倍
+     * 付费趋势：1个月（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1个月（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1个月（买量）金额/人数/增/回/倍")
     private String buyAmountM1;
 
     /**
-     * 付费趋势：2个月（买量）金额/人数/增/回/倍
+     * 付费趋势：2个月（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：2个月（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：2个月（买量）金额/人数/增/回/倍")
     private String buyAmountM2;
 
     /**
-     * 付费趋势：3个月（买量）金额/人数/增/回/倍
+     * 付费趋势：3个月（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3个月（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3个月（买量）金额/人数/增/回/倍")
     private String buyAmountM3;
 
     /**
-     * 付费趋势：6个月（买量）金额/人数/增/回/倍
+     * 付费趋势：6个月（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：6个月（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：6个月（买量）金额/人数/增/回/倍")
     private String buyAmountM6;
 
     /**
-     * 付费趋势：总（买量）金额/人数/增/回/倍
+     * 付费趋势：总（买量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：总（买量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：总（买量）金额/人数/增/回/倍")
     private String buyAmountSum;
 
     /**
-     * 付费趋势：1天（自然量）金额/人数/增/回/倍
+     * 付费趋势：1天（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1天（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1天（自然量）金额/人数/增/回/倍")
     private String natureAmountD1;
 
     /**
-     * 付费趋势：3天（自然量）金额/人数/增/回/倍
+     * 付费趋势：3天（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3天（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3天（自然量）金额/人数/增/回/倍")
     private String natureAmountD3;
 
     /**
-     * 付费趋势：5天（自然量）金额/人数/增/回/倍
+     * 付费趋势：5天（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：5天（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：5天（自然量）金额/人数/增/回/倍")
     private String natureAmountD5;
 
     /**
-     * 付费趋势：7天（自然量）金额/人数/增/回/倍
+     * 付费趋势：7天（自然量）金额/人数/增/回/倍(不展示)
      */
     @ApiModelProperty(value = "付费趋势：7天（自然量）金额/人数/增/回/倍")
     private String natureAmountD7;
 
     /**
-     * 付费趋势：15天（自然量）金额/人数/增/回/倍
+     * 付费趋势：15天（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：15天（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：15天（自然量）金额/人数/增/回/倍")
     private String natureAmountD15;
 
     /**
-     * 付费趋势：1个月（自然量）金额/人数/增/回/倍
+     * 付费趋势：1个月（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1个月（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1个月（自然量）金额/人数/增/回/倍")
     private String natureAmountM1;
 
     /**
-     * 付费趋势：2个月（自然量）金额/人数/增/回/倍
+     * 付费趋势：2个月（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：2个月（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：2个月（自然量）金额/人数/增/回/倍")
     private String natureAmountM2;
 
     /**
-     * 付费趋势：3个月（自然量）金额/人数/增/回/倍
+     * 付费趋势：3个月（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3个月（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3个月（自然量）金额/人数/增/回/倍")
     private String natureAmountM3;
 
     /**
-     * 付费趋势：6个月（自然量）金额/人数/增/回/倍
+     * 付费趋势：6个月（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：6个月（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：6个月（自然量）金额/人数/增/回/倍")
     private String natureAmountM6;
 
     /**
-     * 付费趋势：总（自然量）金额/人数/增/回/倍
+     * 付费趋势：总（自然量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：总（自然量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：总（自然量）金额/人数/增/回/倍")
     private String natureAmountSum;
 
     /**
-     * 付费趋势：1天（总量）金额/人数/增/回/倍
+     * 付费趋势：1天（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1天（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1天（总量）金额/人数/增/回/倍")
     private String amountD1;
 
     /**
-     * 付费趋势：3天（总量）金额/人数/增/回/倍
+     * 付费趋势：3天（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3天（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3天（总量）金额/人数/增/回/倍")
     private String amountD3;
 
     /**
-     * 付费趋势：5天（总量）金额/人数/增/回/倍
+     * 付费趋势：5天（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：5天（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：5天（总量）金额/人数/增/回/倍")
     private String amountD5;
 
     /**
-     * 付费趋势：7天（总量）金额/人数/增/回/倍
+     * 付费趋势：7天（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：7天（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：7天（总量）金额/人数/增/回/倍")
     private String amountD7;
 
     /**
-     * 付费趋势：15天（总量）金额/人数/增/回/倍
+     * 付费趋势：15天（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：15天（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：15天（总量）金额/人数/增/回/倍")
     private String amountD15;
 
     /**
-     * 付费趋势：1个月（总量）金额/人数/增/回/倍
+     * 付费趋势：1个月（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：1个月（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：1个月（总量）金额/人数/增/回/倍")
     private String amountM1;
 
     /**
-     * 付费趋势：2个月（总量）金额/人数/增/回/倍
+     * 付费趋势：2个月（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：2个月（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：2个月（总量）金额/人数/增/回/倍")
     private String amountM2;
 
     /**
-     * 付费趋势：3个月（总量）金额/人数/增/回/倍
+     * 付费趋势：3个月（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：3个月（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：3个月（总量）金额/人数/增/回/倍")
     private String amountM3;
 
     /**
-     * 付费趋势：6个月（总量）金额/人数/增/回/倍
+     * 付费趋势：6个月（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：6个月（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：6个月（总量）金额/人数/增/回/倍")
     private String amountM6;
 
     /**
-     * 付费趋势：总（总量）金额/人数/增/回/倍
+     * 付费趋势：总（总量）金额/人数/增/回/倍(不展示)
      */
-    @ApiModelProperty(value = "付费趋势：总（总量）金额/人数/增/回/倍")
+    @ApiModelProperty(value = "(不展示)付费趋势：总（总量）金额/人数/增/回/倍")
     private String amountSum;
 
+    /**
+     * 付费趋势：1天（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1天（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountD1Trend;
+
+    /**
+     * 付费趋势：3天（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3天（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountD3Trend;
+
+    /**
+     * 付费趋势：5天（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：5天（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountD5Trend;
+
+    /**
+     * 付费趋势：7天（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：7天（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountD7Trend;
+
+    /**
+     * 付费趋势：15天（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：15天（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountD15Trend;
+
+    /**
+     * 付费趋势：1个月（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1个月（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountM1Trend;
+
+    /**
+     * 付费趋势：2个月（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：2个月（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountM2Trend;
+
+    /**
+     * 付费趋势：3个月（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3个月（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountM3Trend;
+
+    /**
+     * 付费趋势：6个月（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：6个月（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountM6Trend;
+
+    /**
+     * 付费趋势：总（买量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：总（买量）金额/人数/增/回/倍")
+    private RechargeTrendVO buyAmountSumTrend;
+
+    /**
+     * 付费趋势：1天（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1天（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountD1Trend;
+
+    /**
+     * 付费趋势：3天（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3天（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountD3Trend;
+
+    /**
+     * 付费趋势：5天（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：5天（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountD5Trend;
+
+    /**
+     * 付费趋势：7天（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：7天（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountD7Trend;
+
+    /**
+     * 付费趋势：15天（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：15天（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountD15Trend;
+
+    /**
+     * 付费趋势：1个月（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1个月（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountM1Trend;
+
+    /**
+     * 付费趋势：2个月（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：2个月（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountM2Trend;
+
+    /**
+     * 付费趋势：3个月（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3个月（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountM3Trend;
+
+    /**
+     * 付费趋势：6个月（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：6个月（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountM6Trend;
+
+    /**
+     * 付费趋势：总（自然量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：总（自然量）金额/人数/增/回/倍")
+    private RechargeTrendVO natureAmountSumTrend;
+
+    /**
+     * 付费趋势：1天（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1天（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountD1Trend;
+
+    /**
+     * 付费趋势：3天（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3天（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountD3Trend;
+
+    /**
+     * 付费趋势：5天（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：5天（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountD5Trend;
+
+    /**
+     * 付费趋势：7天（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：7天（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountD7Trend;
+
+    /**
+     * 付费趋势：15天（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：15天（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountD15Trend;
+
+    /**
+     * 付费趋势：1个月（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：1个月（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountM1Trend;
+
+    /**
+     * 付费趋势：2个月（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：2个月（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountM2Trend;
+
+    /**
+     * 付费趋势：3个月（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：3个月（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountM3Trend;
+
+    /**
+     * 付费趋势：6个月（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：6个月（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountM6Trend;
+
+    /**
+     * 付费趋势：总（总量）金额/人数/增/回/倍(展示数据)
+     */
+    @ApiModelProperty(value = "付费趋势：总（总量）金额/人数/增/回/倍")
+    private RechargeTrendVO amountSumTrend;
+
+
 }

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

@@ -240,6 +240,9 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "不展示--付费趋势：3天")
     private String trendDay3;
 
+    @ApiModelProperty(notes = "不展示--付费趋势：5天")
+    private String trendDay5;
+
     @ApiModelProperty(notes = "不展示--付费趋势：7天")
     private String trendDay7;
 
@@ -255,6 +258,9 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "不展示--付费趋势：3个月")
     private String trendMonth3;
 
+    @ApiModelProperty(notes = "不展示--付费趋势：6个月")
+    private String trendMonth6;
+
     @ApiModelProperty(notes = "不展示--付费趋势：总")
     private String trendTotal;
 
@@ -264,6 +270,9 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "付费趋势：3天")
     private RechargeTrendVO rechargeTrendDay3;
 
+    @ApiModelProperty(notes = "付费趋势：5天")
+    private RechargeTrendVO rechargeTrendDay5;
+
     @ApiModelProperty(notes = "付费趋势：7天")
     private RechargeTrendVO rechargeTrendDay7;
 
@@ -279,6 +288,9 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "付费趋势：3个月")
     private RechargeTrendVO rechargeTrendMonth3;
 
+    @ApiModelProperty(notes = "付费趋势：6个月")
+    private RechargeTrendVO rechargeTrendMonth6;
+
     @ApiModelProperty(notes = "付费趋势：总")
     private RechargeTrendVO rechargeTrendTotal;
 

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

@@ -7,7 +7,6 @@ import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GamePromoteDayTotalDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GamePromoteTotalDTO;
 import com.zanxiang.game.data.serve.pojo.entity.AdsAccountAgentDay;
-import com.zanxiang.game.data.serve.pojo.entity.AdsGameDay;
 import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
 import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayTotalVO;
 import com.zanxiang.game.data.serve.pojo.vo.GamePromoteDayVO;
@@ -25,8 +24,6 @@ import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.entity.Entity;
 import org.nutz.dao.pager.Pager;
-import org.nutz.dao.sql.Criteria;
-import org.nutz.dao.sql.GroupBy;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.Daos;
 import org.nutz.dao.util.cri.SimpleCriteria;
@@ -118,6 +115,15 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                     .multiples(new BigDecimal(trendDay3[4]))
                     .build());
 
+            String[] trendDay5 = item.getTrendDay5().split("/");
+            item.setRechargeTrendDay5(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(trendDay5[0]))
+                    .rechargeUserCount(Long.valueOf(trendDay5[1]))
+                    .increase(new BigDecimal(trendDay5[2]))
+                    .back(new BigDecimal(trendDay5[3]))
+                    .multiples(new BigDecimal(trendDay5[4]))
+                    .build());
+
             String[] trendDay7 = item.getTrendDay7().split("/");
             item.setRechargeTrendDay7(RechargeTrendVO.builder()
                     .rechargeMoney(new BigDecimal(trendDay7[0]))
@@ -163,6 +169,15 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                     .multiples(new BigDecimal(trendMonth3[4]))
                     .build());
 
+            String[] trendMonth6 = item.getTrendMonth6().split("/");
+            item.setRechargeTrendMonth6(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(trendMonth6[0]))
+                    .rechargeUserCount(Long.valueOf(trendMonth6[1]))
+                    .increase(new BigDecimal(trendMonth6[2]))
+                    .back(new BigDecimal(trendMonth6[3]))
+                    .multiples(new BigDecimal(trendMonth6[4]))
+                    .build());
+
             String[] trendTotal = item.getTrendTotal().split("/");
             item.setRechargeTrendTotal(RechargeTrendVO.builder()
                     .rechargeMoney(new BigDecimal(trendTotal[0]))
@@ -449,11 +464,13 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	paper_arpu AS show_recharge_arpu,
                 	amount_d1 AS trend_day1,
                 	amount_d3 AS trend_day3,
+                	amount_d5 AS trend_day5
                 	amount_d7 AS trend_day7,
                 	amount_d15 AS trend_day15,
                 	amount_m1 AS trend_month1,
                 	amount_m2 AS trend_month2,
                 	amount_m3 AS trend_month3,
+                	amount_m6 AS trend_month6,
                 	amount_sum AS trend_total,
                 	hundred_user_num,
                 	hundred_user_num_cost

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

@@ -7,7 +7,10 @@ import com.zanxiang.game.data.serve.pojo.dto.GameDataTotalDTO;
 import com.zanxiang.game.data.serve.pojo.dto.GameDataWaterDTO;
 import com.zanxiang.game.data.serve.pojo.entity.AdsEverydayWater;
 import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
-import com.zanxiang.game.data.serve.pojo.vo.*;
+import com.zanxiang.game.data.serve.pojo.vo.GameDataDayVO;
+import com.zanxiang.game.data.serve.pojo.vo.GameDataTotalVO;
+import com.zanxiang.game.data.serve.pojo.vo.GameDataWaterVO;
+import com.zanxiang.game.data.serve.pojo.vo.RechargeTrendVO;
 import com.zanxiang.game.data.serve.service.IGameDataService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.module.util.DateUtil;
@@ -50,6 +53,11 @@ public class GameDataServiceImpl implements IGameDataService {
     @Autowired
     private Dao dao;
 
+    /**
+     * 游戏每日数据
+     * @param dto 前端传递查询参数
+     * @return 返回给前端的数据
+     */
     @Override
     public Page<GameDataDayVO> getGameDataDay(GameDataDayDTO dto) {
 
@@ -89,10 +97,292 @@ public class GameDataServiceImpl implements IGameDataService {
         //设置查询总数
         pager.setRecordCount(list.size());
 
+        List<GameDataDayVO> gameDataDayVOList = list.stream().map(vo -> {
+            //买量数据
+            String[] buyAmountD1 = vo.getBuyAmountD1().split("/");
+            vo.setBuyAmountD1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountD1[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountD1[1]))
+                    .increase(new BigDecimal(buyAmountD1[2]))
+                    .back(new BigDecimal(buyAmountD1[3]))
+                    .multiples(new BigDecimal(buyAmountD1[4]))
+                    .build());
+
+            String[] buyAmountD3 = vo.getBuyAmountD3().split("/");
+            vo.setBuyAmountD3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountD3[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountD3[1]))
+                    .increase(new BigDecimal(buyAmountD3[2]))
+                    .back(new BigDecimal(buyAmountD3[3]))
+                    .multiples(new BigDecimal(buyAmountD3[4]))
+                    .build());
+
+            String[] buyAmountD5 = vo.getBuyAmountD5().split("/");
+            vo.setBuyAmountD5Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountD5[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountD5[1]))
+                    .increase(new BigDecimal(buyAmountD5[2]))
+                    .back(new BigDecimal(buyAmountD5[3]))
+                    .multiples(new BigDecimal(buyAmountD5[4]))
+                    .build());
+
+            String[] buyAmountD7 = vo.getBuyAmountD7().split("/");
+            vo.setBuyAmountD7Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountD7[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountD7[1]))
+                    .increase(new BigDecimal(buyAmountD7[2]))
+                    .back(new BigDecimal(buyAmountD7[3]))
+                    .multiples(new BigDecimal(buyAmountD7[4]))
+                    .build());
+
+            String[] buyAmountD15 = vo.getBuyAmountD15().split("/");
+            vo.setBuyAmountD15Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountD15[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountD15[1]))
+                    .increase(new BigDecimal(buyAmountD15[2]))
+                    .back(new BigDecimal(buyAmountD15[3]))
+                    .multiples(new BigDecimal(buyAmountD15[4]))
+                    .build());
+
+            String[] buyAmountM1 = vo.getBuyAmountM1().split("/");
+            vo.setBuyAmountM1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountM1[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountM1[1]))
+                    .increase(new BigDecimal(buyAmountM1[2]))
+                    .back(new BigDecimal(buyAmountM1[3]))
+                    .multiples(new BigDecimal(buyAmountM1[4]))
+                    .build());
+
+            String[] buyAmountM2 = vo.getBuyAmountM2().split("/");
+            vo.setBuyAmountM2Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountM2[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountM2[1]))
+                    .increase(new BigDecimal(buyAmountM2[2]))
+                    .back(new BigDecimal(buyAmountM2[3]))
+                    .multiples(new BigDecimal(buyAmountM2[4]))
+                    .build());
+
+            String[] buyAmountM3 = vo.getBuyAmountM3().split("/");
+            vo.setBuyAmountM3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountM3[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountM3[1]))
+                    .increase(new BigDecimal(buyAmountM3[2]))
+                    .back(new BigDecimal(buyAmountM3[3]))
+                    .multiples(new BigDecimal(buyAmountM3[4]))
+                    .build());
+
+            String[] buyAmountM6 = vo.getBuyAmountM6().split("/");
+            vo.setBuyAmountM6Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountM6[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountM6[1]))
+                    .increase(new BigDecimal(buyAmountM6[2]))
+                    .back(new BigDecimal(buyAmountM6[3]))
+                    .multiples(new BigDecimal(buyAmountM6[4]))
+                    .build());
+
+            String[] buyAmountSum = vo.getBuyAmountSum().split("/");
+            vo.setBuyAmountSumTrend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(buyAmountSum[0]))
+                    .rechargeUserCount(Long.valueOf(buyAmountSum[1]))
+                    .increase(new BigDecimal(buyAmountSum[2]))
+                    .back(new BigDecimal(buyAmountSum[3]))
+                    .multiples(new BigDecimal(buyAmountSum[4]))
+                    .build());
+
+            //自然量数据
+            String[] natureAmountD1 = vo.getNatureAmountD1().split("/");
+            vo.setNatureAmountD1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountD1[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountD1[1]))
+                    .increase(new BigDecimal(natureAmountD1[2]))
+                    .back(new BigDecimal(natureAmountD1[3]))
+                    .multiples(new BigDecimal(natureAmountD1[4]))
+                    .build());
+
+            String[] natureAmountD3 = vo.getNatureAmountD3().split("/");
+            vo.setNatureAmountD3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountD3[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountD3[1]))
+                    .increase(new BigDecimal(natureAmountD3[2]))
+                    .back(new BigDecimal(natureAmountD3[3]))
+                    .multiples(new BigDecimal(natureAmountD3[4]))
+                    .build());
+
+            String[] natureAmountD5 = vo.getNatureAmountD5().split("/");
+            vo.setNatureAmountD5Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountD5[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountD5[1]))
+                    .increase(new BigDecimal(natureAmountD5[2]))
+                    .back(new BigDecimal(natureAmountD5[3]))
+                    .multiples(new BigDecimal(natureAmountD5[4]))
+                    .build());
+
+            String[] natureAmountD7 = vo.getNatureAmountD7().split("/");
+            vo.setNatureAmountD7Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountD7[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountD7[1]))
+                    .increase(new BigDecimal(natureAmountD7[2]))
+                    .back(new BigDecimal(natureAmountD7[3]))
+                    .multiples(new BigDecimal(natureAmountD7[4]))
+                    .build());
+
+            String[] natureAmountD15 = vo.getNatureAmountD15().split("/");
+            vo.setNatureAmountD15Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountD15[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountD15[1]))
+                    .increase(new BigDecimal(natureAmountD15[2]))
+                    .back(new BigDecimal(natureAmountD15[3]))
+                    .multiples(new BigDecimal(natureAmountD15[4]))
+                    .build());
+
+            String[] natureAmountM1 = vo.getNatureAmountM1().split("/");
+            vo.setNatureAmountM1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountM1[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountM1[1]))
+                    .increase(new BigDecimal(natureAmountM1[2]))
+                    .back(new BigDecimal(natureAmountM1[3]))
+                    .multiples(new BigDecimal(natureAmountM1[4]))
+                    .build());
+
+            String[] natureAmountM2 = vo.getNatureAmountM2().split("/");
+            vo.setNatureAmountM2Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountM2[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountM2[1]))
+                    .increase(new BigDecimal(natureAmountM2[2]))
+                    .back(new BigDecimal(natureAmountM2[3]))
+                    .multiples(new BigDecimal(natureAmountM2[4]))
+                    .build());
+
+            String[] natureAmountM3 = vo.getNatureAmountM3().split("/");
+            vo.setNatureAmountM3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountM3[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountM3[1]))
+                    .increase(new BigDecimal(natureAmountM3[2]))
+                    .back(new BigDecimal(natureAmountM3[3]))
+                    .multiples(new BigDecimal(natureAmountM3[4]))
+                    .build());
+
+            String[] natureAmountM6 = vo.getNatureAmountM6().split("/");
+            vo.setNatureAmountM6Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountM6[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountM6[1]))
+                    .increase(new BigDecimal(natureAmountM6[2]))
+                    .back(new BigDecimal(natureAmountM6[3]))
+                    .multiples(new BigDecimal(natureAmountM6[4]))
+                    .build());
+
+            String[] natureAmountSum = vo.getNatureAmountSum().split("/");
+            vo.setNatureAmountSumTrend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(natureAmountSum[0]))
+                    .rechargeUserCount(Long.valueOf(natureAmountSum[1]))
+                    .increase(new BigDecimal(natureAmountSum[2]))
+                    .back(new BigDecimal(natureAmountSum[3]))
+                    .multiples(new BigDecimal(natureAmountSum[4]))
+                    .build());
+
+            //总量数据
+            String[] amountD1 = vo.getAmountD1().split("/");
+            vo.setAmountD1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountD1[0]))
+                    .rechargeUserCount(Long.valueOf(amountD1[1]))
+                    .increase(new BigDecimal(amountD1[2]))
+                    .back(new BigDecimal(amountD1[3]))
+                    .multiples(new BigDecimal(amountD1[4]))
+                    .build());
+
+            String[] amountD3 = vo.getAmountD3().split("/");
+            vo.setAmountD3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountD3[0]))
+                    .rechargeUserCount(Long.valueOf(amountD3[1]))
+                    .increase(new BigDecimal(amountD3[2]))
+                    .back(new BigDecimal(amountD3[3]))
+                    .multiples(new BigDecimal(amountD3[4]))
+                    .build());
+
+            String[] amountD5 = vo.getAmountD5().split("/");
+            vo.setAmountD5Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountD5[0]))
+                    .rechargeUserCount(Long.valueOf(amountD5[1]))
+                    .increase(new BigDecimal(amountD5[2]))
+                    .back(new BigDecimal(amountD5[3]))
+                    .multiples(new BigDecimal(amountD5[4]))
+                    .build());
+
+            String[] amountD7 = vo.getAmountD7().split("/");
+            vo.setAmountD7Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountD7[0]))
+                    .rechargeUserCount(Long.valueOf(amountD7[1]))
+                    .increase(new BigDecimal(amountD7[2]))
+                    .back(new BigDecimal(amountD7[3]))
+                    .multiples(new BigDecimal(amountD7[4]))
+                    .build());
+
+            String[] amountD15 = vo.getAmountD15().split("/");
+            vo.setAmountD15Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountD15[0]))
+                    .rechargeUserCount(Long.valueOf(amountD15[1]))
+                    .increase(new BigDecimal(amountD15[2]))
+                    .back(new BigDecimal(amountD15[3]))
+                    .multiples(new BigDecimal(amountD15[4]))
+                    .build());
+
+            String[] amountM1 = vo.getAmountM1().split("/");
+            vo.setAmountM1Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountM1[0]))
+                    .rechargeUserCount(Long.valueOf(amountM1[1]))
+                    .increase(new BigDecimal(amountM1[2]))
+                    .back(new BigDecimal(amountM1[3]))
+                    .multiples(new BigDecimal(amountM1[4]))
+                    .build());
+
+            String[] amountM2 = vo.getAmountM2().split("/");
+            vo.setAmountM2Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountM2[0]))
+                    .rechargeUserCount(Long.valueOf(amountM2[1]))
+                    .increase(new BigDecimal(amountM2[2]))
+                    .back(new BigDecimal(amountM2[3]))
+                    .multiples(new BigDecimal(amountM2[4]))
+                    .build());
+
+            String[] amountM3 = vo.getAmountM3().split("/");
+            vo.setAmountM3Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountM3[0]))
+                    .rechargeUserCount(Long.valueOf(amountM3[1]))
+                    .increase(new BigDecimal(amountM3[2]))
+                    .back(new BigDecimal(amountM3[3]))
+                    .multiples(new BigDecimal(amountM3[4]))
+                    .build());
+
+            String[] amountM6 = vo.getAmountM6().split("/");
+            vo.setAmountM6Trend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountM6[0]))
+                    .rechargeUserCount(Long.valueOf(amountM6[1]))
+                    .increase(new BigDecimal(amountM6[2]))
+                    .back(new BigDecimal(amountM6[3]))
+                    .multiples(new BigDecimal(amountM6[4]))
+                    .build());
+
+            String[] amountSum = vo.getAmountSum().split("/");
+            vo.setAmountSumTrend(RechargeTrendVO.builder()
+                    .rechargeMoney(new BigDecimal(amountSum[0]))
+                    .rechargeUserCount(Long.valueOf(amountSum[1]))
+                    .increase(new BigDecimal(amountSum[2]))
+                    .back(new BigDecimal(amountSum[3]))
+                    .multiples(new BigDecimal(amountSum[4]))
+                    .build());
+
+            return vo;
+        }).collect(Collectors.toList());
+
         //返回list结果 封装到page对象里
-        return new Page<>(list, pager);
+        return new Page<>(gameDataDayVOList, pager);
     }
 
+    /**
+     * 游戏总数据
+     * @param dto 前端传递的查询参数
+     * @return 返回给前端的数据
+     */
     @Override
     public Page<GameDataTotalVO> getGameDataTotal(GameDataTotalDTO dto) {
         //如果注册时间参数为空，默认设置查询当天数据