修改内容：游戏数据总计

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

@@ -36,7 +36,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) {
@@ -44,7 +44,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏每日数据总计")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:dayTotal")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:dayTotal")
     @PostMapping("/day/total")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDataDayVO.class)})
     public ResultVO<GameDataDayTotalVO> getGameDataDay(@RequestBody GameDataDayTotalDTO dto) {
@@ -58,7 +58,7 @@ public class GameDataController {
         return ResultVO.ok(gameDataService.getH5Recharge(dto));
     }
     @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) {
@@ -73,7 +73,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "游戏每日复充数据")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:again")
+    //@PreAuthorize(permissionKey = "gameData:adsGameDay:again")
     @PostMapping("/again")
     public ResultVO<Map<LocalDate, List<GameDataAgainDayVO>>> getGameDataAgainDay(@RequestBody GameDataAgainDayDTO dto) throws Exception {
         return ResultVO.ok(gameDataService.getGameDataAgainDay(dto));

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

@@ -147,16 +147,22 @@ public class AdsGameDay implements Serializable {
     private BigDecimal newUserTotalAmount;
 
     /**
-     * 首日付费率（总）
+     * 首日ROI（总）
      */
     @Column
     private BigDecimal firstRoi;
 
+    /**
+     * 首日付费率（总）
+     */
+    @Column
+    private BigDecimal firstAmountRate;
+
     /**
      * 当天付费率（总）
      */
     @Column
-    private BigDecimal todayRoi;
+    private BigDecimal todayAmountRate;
 
     /**
      * 新用户付费比（总）
@@ -224,24 +230,72 @@ public class AdsGameDay implements Serializable {
     @Column
     private String amountD1;
 
+    /**
+     * 付费趋势第2天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD2;
+
     /**
      * 付费趋势第三天总：金额/人数/增/回/倍（总量）
      */
     @Column
     private String amountD3;
 
+    /**
+     * 付费趋势第4天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD4;
+
     /**
      * 付费趋势第五天总：金额/人数/增/回/倍（总量）
      */
     @Column
     private String amountD5;
 
+    /**
+     * 付费趋势第6天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD6;
+
     /**
      * 付费趋势第七天总：金额/人数/增/回/倍（总量）
      */
     @Column
     private String amountD7;
 
+    /**
+     * 付费趋势第8天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD8;
+
+    /**
+     * 付费趋势第9天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD9;
+
+    /**
+     * 付费趋势第10天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD10;
+
+    /**
+     * 付费趋势第11天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD11;
+
+    /**
+     * 付费趋势第12天总：金额/人数/增/回/倍（总量）
+     */
+    @Column
+    private String amountD12;
+
     /**
      * 付费趋势第十五天总：金额/人数/增/回/倍（总量）
      */
@@ -357,16 +411,22 @@ public class AdsGameDay implements Serializable {
     private BigDecimal buyNewUserTotalAmount;
 
     /**
-     * 首日付费率（买量）
+     * 首日ROI（买量）
      */
     @Column
     private BigDecimal buyFirstRoi;
 
+    /**
+     * 首日付费率(买量)
+     */
+    @Column
+    private BigDecimal buyFirstAmountRate;
+
     /**
      * 当天付费率（买量）
      */
     @Column
-    private BigDecimal buyTodayRoi;
+    private BigDecimal buyTodayAmountRate;
 
     /**
      * 新用户付费比（买量）
@@ -567,16 +627,22 @@ public class AdsGameDay implements Serializable {
     private BigDecimal natureNewUserTotalAmount;
 
     /**
-     * 首日付费率（自然量）
+     * 首日ROI（自然量）
      */
     @Column
     private BigDecimal natureFirstRoi;
 
+    /**
+     * 首日付费率(自然量)
+     */
+    @Column
+    private BigDecimal natureFirstAmountRate;
+
     /**
      * 当天付费率（自然量）
      */
     @Column
-    private BigDecimal natureTodayRoi;
+    private BigDecimal natureTodayAmountRate;
 
     /**
      * 新用户付费比（自然量）

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

@@ -115,17 +115,23 @@ public class GameDataDayTotalVO {
     @ApiModelProperty(value = "新用户累计充值金额（买量）")
     private BigDecimal buyNewUserTotalAmount;
 
+    /**
+     * 首日ROI（买量）
+     */
+    @ApiModelProperty(value = "首日ROI（买量）")
+    private BigDecimal buyFirstRoi;
+
     /**
      * 首日付费率（买量）
      */
     @ApiModelProperty(value = "首日付费率（买量）")
-    private BigDecimal buyFirstRoi;
+    private BigDecimal buyFirstAmountRate;
 
     /**
      * 当天付费率（买量）
      */
     @ApiModelProperty(value = "当天付费率（买量）")
-    private BigDecimal buyTodayRoi;
+    private BigDecimal buyTodayAmountRate;
 
     /**
      * 新用户付费比（买量）
@@ -253,17 +259,23 @@ public class GameDataDayTotalVO {
     @ApiModelProperty(value = "新用户累计充值金额（自然量）")
     private BigDecimal natureNewUserTotalAmount;
 
+    /**
+     * 首日ROI（自然量）
+     */
+    @ApiModelProperty(value = "首日ROI（自然量）")
+    private BigDecimal natureFirstRoi;
+
     /**
      * 首日付费率（自然量）
      */
     @ApiModelProperty(value = "首日付费率（自然量）")
-    private BigDecimal natureFirstRoi;
+    private BigDecimal natureFirstAmountRate;
 
     /**
      * 当天付费率（自然量）
      */
     @ApiModelProperty(value = "当天付费率（自然量）")
-    private BigDecimal natureTodayRoi;
+    private BigDecimal natureTodayAmountRate;
 
     /**
      * 新用户付费比（自然量）
@@ -391,17 +403,23 @@ public class GameDataDayTotalVO {
     @ApiModelProperty(value = "新用户累计充值金额（总量）")
     private BigDecimal newUserTotalAmount;
 
+    /**
+     * 首日ROI（总量）
+     */
+    @ApiModelProperty(value = "首日ROI（总量）")
+    private BigDecimal firstRoi;
+
     /**
      * 首日付费率（总量）
      */
     @ApiModelProperty(value = "首日付费率（总量）")
-    private BigDecimal firstRoi;
+    private BigDecimal firstAmountRate;
 
     /**
      * 当天付费率（总量）
      */
     @ApiModelProperty(value = "当天付费率（总量）")
-    private BigDecimal todayRoi;
+    private BigDecimal todayAmountRate;
 
     /**
      * 新用户付费比（总量）

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

@@ -142,9 +142,9 @@ public class GameDataDayVO {
     private BigDecimal buyNewUserTotalAmount;
 
     /**
-     * 首日付费率（买量）
+     * 首日ROI（买量）
      */
-    @ApiModelProperty(value = "首日付费率（买量）")
+    @ApiModelProperty(value = "首日ROI（买量）")
     private BigDecimal buyFirstRoi;
 
     @ApiModelProperty(value = "首日付费率（买量）")
@@ -280,7 +280,7 @@ public class GameDataDayVO {
     private BigDecimal natureNewUserTotalAmount;
 
     /**
-     * 首日付费率（自然量）
+     * 首日roi（自然量）
      */
     @ApiModelProperty(value = "首日roi（自然量）")
     private BigDecimal natureFirstRoi;
@@ -418,9 +418,9 @@ public class GameDataDayVO {
     private BigDecimal newUserTotalAmount;
 
     /**
-     * 首日付费率（总量）
+     * 首日Roi（总量）
      */
-    @ApiModelProperty(value = "首日付费率（总量）")
+    @ApiModelProperty(value = "首日Roi（总量）")
     private BigDecimal firstRoi;
 
     @ApiModelProperty(value = "首日付费率（总）")

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

@@ -1324,8 +1324,9 @@ public class GameDataServiceImpl implements IGameDataService {
                 SUM(buy_new_user_total_amount_count) buy_new_user_total_amount_count,
                 SUM(buy_new_user_total_amount_num) buy_new_user_total_amount_num,
                 SUM(buy_new_user_total_amount) buy_new_user_total_amount,
-                round(if(SUM(buy_reg_num) > 0 , SUM(buy_first_new_user_amount_num) / SUM(buy_reg_num) ,0), 4) buy_first_roi,
-                round(if(SUM(buy_reg_num) > 0, SUM(buy_new_user_total_amount_num) / SUM(buy_reg_num), 0) ,4) buy_today_roi,
+                round(if(SUM(cost) > 0 , SUM(buy_first_new_user_amount) / SUM(cost) ,0), 4) buy_first_roi,
+                round(if(SUM(buy_reg_num) > 0 , SUM(buy_first_new_user_amount_num) / SUM(buy_reg_num) ,0), 4) buy_first_amount_rate,
+                round(if(SUM(buy_reg_num) > 0, SUM(buy_new_user_total_amount_num) / SUM(buy_reg_num), 0) ,4) buy_today_amount_rate,
                 round(if(SUM(buy_amount_num) > 0 , SUM(buy_first_new_user_amount_num) / SUM(buy_amount_num) ,0), 4) buy_new_user_rate,
                 round(if(SUM(buy_first_new_user_amount_count) > 0, SUM(buy_first_new_user_amount) / SUM(buy_first_new_user_amount_count), 0), 2) buy_first_avg_amount,
                 round(if(SUM(buy_new_user_total_amount_count) > 0, SUM(buy_new_user_total_amount) / SUM(buy_new_user_total_amount_count), 0), 2) buy_today_avg_amount,
@@ -1348,8 +1349,9 @@ public class GameDataServiceImpl implements IGameDataService {
                 SUM(nature_new_user_total_amount_count) nature_new_user_total_amount_count,
                 SUM(nature_new_user_total_amount_num) nature_new_user_total_amount_num,
                 SUM(nature_new_user_total_amount) nature_new_user_total_amount,
-                round(if(SUM(nature_reg_num) > 0 , SUM(nature_first_new_user_amount_num) / SUM(nature_reg_num) ,0), 4) nature_first_roi,
-                round(if(SUM(nature_reg_num) > 0, SUM(nature_new_user_total_amount_num) / SUM(nature_reg_num), 0) ,4) nature_today_roi,
+                round(if(SUM(cost) > 0 , SUM(nature_first_new_user_amount) / SUM(cost) ,0), 4) nature_first_roi,
+                round(if(SUM(nature_reg_num) > 0 , SUM(nature_first_new_user_amount_num) / SUM(nature_reg_num) ,0), 4) nature_first_amount_rate,
+                round(if(SUM(nature_reg_num) > 0, SUM(nature_new_user_total_amount_num) / SUM(nature_reg_num), 0) ,4) nature_today_amount_rate,
                 round(if(SUM(nature_amount_num) > 0 , SUM(nature_first_new_user_amount_num) / SUM(nature_amount_num) ,0), 4) nature_new_user_rate,
                 round(if(SUM(nature_first_new_user_amount_count) > 0, SUM(nature_first_new_user_amount) / SUM(nature_first_new_user_amount_count), 0), 2) nature_first_avg_amount,
                 round(if(SUM(nature_new_user_total_amount_count) > 0, SUM(nature_new_user_total_amount) / SUM(nature_new_user_total_amount_count), 0), 2) nature_today_avg_amount,
@@ -1372,8 +1374,9 @@ public class GameDataServiceImpl implements IGameDataService {
                 SUM(new_user_total_amount_count) new_user_total_amount_count,
                 SUM(new_user_total_amount_num) new_user_total_amount_num,
                 SUM(new_user_total_amount) new_user_total_amount,
-                round(if(SUM(reg_num) > 0 , SUM(first_new_user_amount_num) / SUM(reg_num) ,0), 4) first_roi,
-                round(if(SUM(reg_num) > 0, SUM(new_user_total_amount_num) / SUM(reg_num), 0) ,4) today_roi,
+                round(if(SUM(cost) > 0 , SUM(first_new_user_amount) / SUM(cost) ,0), 4) first_roi,
+                round(if(SUM(reg_num) > 0 , SUM(first_new_user_amount_num) / SUM(reg_num) ,0), 4) first_amount_rate,
+                round(if(SUM(reg_num) > 0, SUM(new_user_total_amount_num) / SUM(reg_num), 0) ,4) today_amount_rate,
                 round(if(SUM(amount_num) > 0 , SUM(first_new_user_amount_num) / SUM(amount_num) ,0), 4) new_user_rate,
                 round(if(SUM(first_new_user_amount_count) > 0, SUM(first_new_user_amount) / SUM(first_new_user_amount_count), 0), 2) first_avg_amount,
                 round(if(SUM(new_user_total_amount_count) > 0, SUM(new_user_total_amount) / SUM(new_user_total_amount_count), 0), 2) today_avg_amount,