修改内容：h5

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

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

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

@@ -44,7 +44,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "h5游戏充值")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:h5")
+//    @PreAuthorize(permissionKey = "gameData:adsGameDay:h5")
     @PostMapping("/h5")
     public ResultVO<Page<GameDataH5VO>> getH5Recharge(@RequestBody GameDataH5DTO dto) {
         return ResultVO.ok(gameDataService.getH5Recharge(dto));
@@ -58,7 +58,7 @@ public class GameDataController {
     }
 
     @ApiOperation(value = "每日流水贡献")
-    @PreAuthorize(permissionKey = "gameData:adsGameDay:water")
+//    @PreAuthorize(permissionKey = "gameData:adsGameDay:water")
     @PostMapping("/water")
     public ResultVO<Page<GameDataWaterVO>> getGameDataWater(@RequestBody GameDataWaterDTO dto) {
         return ResultVO.ok(gameDataService.getGameDataWater(dto));

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameDataH5DTO.java

@@ -22,6 +22,9 @@ public class GameDataH5DTO extends BasePage {
     @ApiModelProperty(notes = "游戏名称")
     private String gameName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "SDK来源")
     private String sourceSystem;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameDataWaterDTO.java

@@ -27,6 +27,9 @@ public class GameDataWaterDTO extends BasePage {
     @ApiModelProperty(notes = "游戏名称")
     private String gameName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "SDK来源")
     private String sourceSystem;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayDTO.java

@@ -27,6 +27,8 @@ public class GamePromoteDayDTO extends BasePage {
     @ApiModelProperty(notes = "cp名")
     private String cpName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
     @ApiModelProperty(notes = "游戏名")
     private String gameName;
     @ApiModelProperty(notes = "游戏应用类型")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteDayTotalDTO.java

@@ -26,6 +26,9 @@ public class GamePromoteDayTotalDTO {
     @ApiModelProperty(notes = "cp名")
     private String cpName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "游戏名")
     private String gameName;
     @ApiModelProperty(notes = "游戏应用类型")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GamePromoteTotalDTO.java

@@ -27,6 +27,9 @@ public class GamePromoteTotalDTO extends BasePage {
     @ApiModelProperty(notes = "cp名")
     private String cpName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "游戏名")
     private String gameName;
     @ApiModelProperty(notes = "游戏应用类型")

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

@@ -84,6 +84,9 @@ public class AdsAccountAgentDay implements Serializable {
     @Column
     private String gameName;
 
+    @Column
+    private Long gameId;
+
     /**
      * 推广游戏类型
      */

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

@@ -35,6 +35,9 @@ public class GamePromoteDayVO {
     @ApiModelProperty(notes = "cp名")
     private String cpName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "游戏名")
     private String gameName;
     @ApiModelProperty(notes = "游戏应用类型")

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

@@ -31,6 +31,9 @@ public class GamePromoteTotalVO {
     @ApiModelProperty(notes = "cp名")
     private String cpName;
 
+    @ApiModelProperty(notes = "游戏id")
+    private Long gameId;
+
     @ApiModelProperty(notes = "游戏名")
     private String gameName;
     @ApiModelProperty(notes = "游戏应用类型")

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

@@ -84,6 +84,9 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (StringUtils.isNotBlank(dto.getGameName())) {
             cri.where().andLike("game_name", dto.getGameName());
         }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("game_id", dto.getGameId());
+        }
         if (StringUtils.isNotBlank(dto.getGameType())) {
             cri.where().andEquals("game_type", dto.getGameType());
         }
@@ -228,6 +231,9 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (StringUtils.isNotBlank(dto.getGameType())) {
             cri.where().andEquals("game_type", dto.getGameType());
         }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("game_id", dto.getGameId());
+        }
         if (null != dto.getBeginDay()) {
             cri.where().and("dt", ">=", dto.getBeginDay());
         }
@@ -291,6 +297,9 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (null != dto.getCostEndDay()) {
             cri.where().and("a.dt", "<=", dto.getCostEndDay());
         }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("a.game_id", dto.getGameId());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("a.source_system", dto.getSourceSystem());
         }
@@ -624,6 +633,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	agent_id,
                 	pitcher AS sys_user_name,
                 	game_cp AS cp_name,
+                	game_id,
                 	game_name,
                 	game_type,
                 	dt AS cost_day,
@@ -802,6 +812,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 	max(a.account_type) as account_type,
                 	max(a.pitcher) as sys_user_name,
                 	max(a.game_cp) as cp_name,
+                	max(a.game_id) as game_id,
                 	max(a.game_name) as game_name,
                 	max(a.game_type) as game_type,
                 	max(a.pitcher_id) as sys_user_id,

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

@@ -630,6 +630,9 @@ public class GameDataServiceImpl implements IGameDataService {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("game_id", dto.getGameId());
+        }
         cri.where().and("dt", "=", dto.getRechargeDate());
         cri.groupBy("source_system,game_id");
         cri.orderBy(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, dto.getSortFiled()), dto.getSortType());
@@ -1451,6 +1454,9 @@ public class GameDataServiceImpl implements IGameDataService {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andLike("a.source_system", dto.getSourceSystem());
         }
+        if (null != dto.getGameId()) {
+            cri.where().andEquals("a.game_id", dto.getGameId());
+        }
         cri.where().and("a.dt", ">=", dto.getCostBeginDate()).and("a.dt", "<=", dto.getCostEndDate());
         cri.where().andEquals("a.id", 1);
         cri.groupBy("a.source_system,a.game_id");