修改内容：每日流水

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/entity/AdsEverydayWater.java

@@ -126,5 +126,11 @@ public class AdsEverydayWater implements Serializable {
     @Column
     private BigDecimal proportion;
 
+    @Column
+    private String roleName;
+
+    @Column
+    private String serverName;
+
 
 }

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

@@ -48,5 +48,11 @@ public class PlayerTemplateVO {
     @ApiModelProperty("用户充值占比")
     private BigDecimal proportion;
 
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    @ApiModelProperty("游戏服")
+    private String serverName;
+
 
 }

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

@@ -503,6 +503,8 @@ public class GameDataServiceImpl implements IGameDataService {
                                         .userAmount(adsEverydayWater.getUserAmount())
                                         .userOrderBy(Integer.valueOf(adsEverydayWater.getUserOrderBy()))
                                         .userName(adsEverydayWater.getUserName())
+                                        .roleName(adsEverydayWater.getRoleName())
+                                        .serverName(adsEverydayWater.getServerName())
                                         .proportion(
                                                 item.getAmount().compareTo(BigDecimal.ZERO) == 0 ?
                                                         BigDecimal.ZERO :
@@ -2087,6 +2089,8 @@ public class GameDataServiceImpl implements IGameDataService {
                 amount_order_by,
                 amount_post,
                 amount_count,
+                role_name,
+                server_name,
                 amount_num
                 from ads_everyday_water
                 """;