Merge branch 'package' of GameCenter/game-center into dev

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

@@ -47,7 +47,7 @@ public class RoleManageController {
     @ApiOperation(value = "创建发送消息任务")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:create")
     @PostMapping("/sendMsgTask")
-    public ResultVO createSendMsgTask(@RequestBody @Valid SendMsgTaskDto dto) {
+    public ResultVO createSendMsgTask(@RequestBody @Valid SendMsgTaskDTO dto) {
         roleManageService.createSendMsgTask(dto);
         return ResultVO.ok("操作成功", true);
     }
@@ -55,7 +55,7 @@ public class RoleManageController {
     @ApiOperation(value = "查询发送消息任务列表")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:list")
     @PostMapping("/sendMsgTask/list")
-    public ResultVO<Page<SendMsgVO>> getSendMsgTaskList(@RequestBody MsgTaskDto dto) {
+    public ResultVO<Page<SendMsgVO>> getSendMsgTaskList(@RequestBody MsgTaskDTO dto) {
         return ResultVO.ok(roleManageService.getSendMsgTaskList(dto));
     }
 
@@ -63,7 +63,7 @@ public class RoleManageController {
     @ApiOperation(value = "查询发送消息任务结果")
     @PreAuthorize(permissionKey = "roleManage:sendMsgTask:resultList")
     @PostMapping("/sendMsgTask/resultList")
-    public ResultVO<Page<SendMsgResultVO>> getSendMsgResultList(@RequestBody @Valid MsgTaskResultDto msgTaskResultDto) {
+    public ResultVO<Page<SendMsgResultVO>> getSendMsgResultList(@RequestBody @Valid MsgTaskResultDTO msgTaskResultDto) {
         return ResultVO.ok(roleManageService.getSendMsgResultList(msgTaskResultDto));
     }
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameDTO.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.data.serve.pojo.dto;
 import lombok.Data;
 
 @Data
-public class GameDto {
+public class GameDTO {
 
 
     private Integer id;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskDTO.java

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Description 消息任务查询dto
  **/
 @Data
-public class MsgTaskDto extends BasePage {
+public class MsgTaskDTO extends BasePage {
 
     @ApiModelProperty(value = "游戏id")
     private Long gameId;

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskResultDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskResultDTO.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @Description 查询任务结果Dto
  **/
 @Data
-public class MsgTaskResultDto extends BasePage implements Serializable {
+public class MsgTaskResultDTO extends BasePage implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotNull(message = "任务id不能为空")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDTO.java

@@ -1,14 +1,12 @@
 package com.zanxiang.game.data.serve.pojo.dto;
 
 
-import com.zanxiang.game.data.serve.pojo.enums.TaskStrategyEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  * @Description 发送消息任务参数
  **/
 @Data
-public class SendMsgTaskDto  implements Serializable {
+public class SendMsgTaskDTO implements Serializable {
 
     /**
      * 任务名称

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/TaskResultDto.java → game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/TaskResultDTO.java

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
  * @Description 补充任务查询结果Dto
  **/
 @Data
-public class TaskResultDto {
+public class TaskResultDTO {
 
     /**
      * 角色id

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

@@ -945,4 +945,35 @@ public class PromotionDayTotalVO {
     @ApiModelProperty("七日付费金额")
     private BigDecimal day7Amount;
 
+    /**
+     * 7日付费100+用户数
+     */
+    @ApiModelProperty(value = "7日付费100+用户数")
+    private Long day7OneHundredAmountNum;
+    /**
+     * 7日付费100+用户付费成本
+     */
+    @ApiModelProperty(value = "7日付费100+用户付费成本")
+    private BigDecimal day7OneHundredAmountNumCost;
+    /**
+     * 7日付费200+用户数
+     */
+    @ApiModelProperty(value = "7日付费200+用户数")
+    private Long day7TwoHundredAmountNum;
+    /**
+     * 7日付费200+用户付费成本
+     */
+    @ApiModelProperty(value = "7日付费200+用户付费成本")
+    private BigDecimal day7TwoHundredAmountNumCost;
+    /**
+     * 至今付费200+用户数
+     */
+    @ApiModelProperty(value = "至今付费200+用户数")
+    private Long newUserTwoHundredUserNum;
+    /**
+     * 至今付费200+用户付费成本
+     */
+    @ApiModelProperty(value = "至今付费200+用户付费成本")
+    private BigDecimal newUserTwoHundredUserNumCost;
+
 }

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

@@ -1120,5 +1120,37 @@ public class PromotionDayVO {
      */
     @ApiModelProperty("七日付费金额")
     private BigDecimal day7Amount;
-    
+
+    /**
+     * 7日付费100+用户数
+     */
+    @ApiModelProperty(value = "7日付费100+用户数")
+    private Long day7OneHundredAmountNum;
+    /**
+     * 7日付费100+用户付费成本
+     */
+    @ApiModelProperty(value = "7日付费100+用户付费成本")
+    private BigDecimal day7OneHundredAmountNumCost;
+    /**
+     * 7日付费200+用户数
+     */
+    @ApiModelProperty(value = "7日付费200+用户数")
+    private Long day7TwoHundredAmountNum;
+    /**
+     * 7日付费200+用户付费成本
+     */
+    @ApiModelProperty(value = "7日付费200+用户付费成本")
+    private BigDecimal day7TwoHundredAmountNumCost;
+    /**
+     * 至今付费200+用户数
+     */
+    @ApiModelProperty(value = "至今付费200+用户数")
+    private Long newUserTwoHundredUserNum;
+    /**
+     * 至今付费200+用户付费成本
+     */
+    @ApiModelProperty(value = "至今付费200+用户付费成本")
+    private BigDecimal newUserTwoHundredUserNumCost;
+
+
 }

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

@@ -18,7 +18,7 @@ public interface IRoleManageService {
      * 创建发送消息任务
      * @param dto
      */
-    void createSendMsgTask(SendMsgTaskDto dto);
+    void createSendMsgTask(SendMsgTaskDTO dto);
 
 
     /**
@@ -33,12 +33,12 @@ public interface IRoleManageService {
      * @param dto
      * @return
      */
-    Page<SendMsgVO> getSendMsgTaskList(MsgTaskDto dto);
+    Page<SendMsgVO> getSendMsgTaskList(MsgTaskDTO dto);
 
     /**
      * 查询发送消息任务结果
      * @param msgTaskResultDto
      * @return
      */
-    Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDto msgTaskResultDto);
+    Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDTO msgTaskResultDto);
 }

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

@@ -1070,7 +1070,13 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     day7_amount_per_count,
                     day7_arpu,
                     day7_amount_num,
-                    day7_amount
+                    day7_amount,
+                    day7_one_hundred_amount_num,
+                    day7_one_hundred_amount_num_cost,
+                    day7_two_hundred_amount_num,
+                    day7_two_hundred_amount_num_cost,
+                    new_user_two_hundred_user_num,
+                    new_user_two_hundred_user_num_cost
                 FROM
                 	game_ads.ads_promotion_day
                 """;
@@ -1187,7 +1193,13 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                 	    ROUND(if(SUM(day7_amount_num) > 0, SUM(day7_amount_count) / SUM(day7_amount_num), 0), 2) as day7_amount_per_count,
                 	    ROUND(if(SUM(day7_amount_num) > 0, SUM(day7_amount) / SUM(day7_amount_num), 0), 2) as day7_arpu,
                 	    SUM(day7_amount) as day7_amount,
-                	    SUM(day7_amount_num) as day7_amount_num
+                	    SUM(day7_amount_num) as day7_amount_num,
+                	    SUM(day7_one_hundred_amount_num) as day7_one_hundred_amount_num ,
+                     	SUM(day7_one_hundred_amount_num_cost) as day7_one_hundred_amount_num_cost,
+                     	SUM(day7_two_hundred_amount_num) as day7_two_hundred_amount_num,
+                     	SUM(day7_two_hundred_amount_num_cost) as day7_two_hundred_amount_num_cost,
+                     	SUM(new_user_two_hundred_user_num) as new_user_two_hundred_user_num,
+                     	SUM(new_user_two_hundred_user_num_cost) as new_user_two_hundred_user_num_cost
                 	FROM
                 		game_ads.ads_promotion_day
                 """ + criA +
@@ -1324,7 +1336,13 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
                     ROUND(if(SUM(day7_amount_num) > 0, SUM(day7_amount_count) / SUM(day7_amount_num), 0), 2) as day7_amount_per_count,
                     ROUND(if(SUM(day7_amount_num) > 0, SUM(day7_amount) / SUM(day7_amount_num), 0), 2) as day7_arpu,
                     SUM(day7_amount) as day7_amount,
-                    SUM(day7_amount_num) as day7_amount_num
+                    SUM(day7_amount_num) as day7_amount_num,
+                    SUM(day7_one_hundred_amount_num) as day7_one_hundred_amount_num,
+                    SUM(day7_one_hundred_amount_num_cost) as day7_one_hundred_amount_num_cost,
+                    SUM(day7_two_hundred_amount_num) as day7_two_hundred_amount_num,
+                    SUM(day7_two_hundred_amount_num_cost) as day7_two_hundred_amount_num_cost,
+                    SUM(new_user_two_hundred_user_num) as new_user_two_hundred_user_num,
+                    SUM(new_user_two_hundred_user_num_cost) as new_user_two_hundred_user_num_cost
                 FROM
                 	game_ads.ads_promotion_day
                 """;

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

@@ -12,7 +12,7 @@ import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
 import com.zanxiang.game.data.serve.service.IRoleManageService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.game.module.base.ServerInfo;
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
 import com.zanxiang.game.module.base.util.PageUtil;
@@ -333,11 +333,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @param dto
      */
     @Override
-    public void createSendMsgTask(SendMsgTaskDto dto) {
+    public void createSendMsgTask(SendMsgTaskDTO dto) {
         //获取当前用户id
         Long sysUserId = SecurityUtil.getUserId();
         //构建发送消息dto
-        SendMsgDto sendMsgDto = buildSendMsgDto(dto, sysUserId);
+        SendMsgDTO sendMsgDto = buildSendMsgDto(dto, sysUserId);
         //调用发送消息接口
         ResultVO<Boolean> booleanResultVO = sendMsgRpc.sendMsg(sendMsgDto);
         if (!booleanResultVO.isSuccess()) {
@@ -346,7 +346,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
     }
 
 
-    private SendMsgDto buildSendMsgDto(SendMsgTaskDto dto, Long sysUserId) {
+    private SendMsgDTO buildSendMsgDto(SendMsgTaskDTO dto, Long sysUserId) {
 //        //先查出来所有的角色
 //        List<Map> roleList = getRoleList(dto.getRoleRechargeRankingDTO());
 //
@@ -355,7 +355,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
 //                .map(map -> Optional.ofNullable(map.get("role_id")).map(Object::toString).orElse(null))
 //                .toList();
 
-        SendMsgDto sendMsgDto = new SendMsgDto();
+        SendMsgDTO sendMsgDto = new SendMsgDTO();
         //任务名称
         sendMsgDto.setTaskName(dto.getTaskName());
         //消息
@@ -561,7 +561,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      * @return Page<SendMsgVo>
      */
     @Override
-    public Page<SendMsgVO> getSendMsgTaskList(MsgTaskDto dto) {
+    public Page<SendMsgVO> getSendMsgTaskList(MsgTaskDTO dto) {
         try {
             SendMsgTaskParam sendMsgTaskParam = new SendMsgTaskParam();
             sendMsgTaskParam.setGameId(dto.getGameId());
@@ -571,24 +571,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
             if(CollectionUtils.isEmpty(sendMsgTaskList.getRecords())){
                 return new Page<>(sendMsgTaskList.getRecords(),sendMsgTaskList.getTotal(),sendMsgTaskList.getSize(),sendMsgTaskList.getCurrent(),sendMsgTaskList.getPages());
             }
-            //查询所有游戏名称
-            Sql sql = Sqls.create(getGameSql());
-            sql.setCallback(Sqls.callback.entities());
-            sql.setEntity(dao.getEntity(GameDto.class));
-            dao.execute(sql);
-            List<GameDto> gameDtoList = sql.getList(GameDto.class);
-            //将游戏拼成map key为父游戏id，value为游戏名称
-            HashMap<Long, String> gameMap = new HashMap<>();
-            gameDtoList.forEach(item -> {
-                gameMap.put(item.getParentId(), item.getGameName());
-            });
+            //查询所有父游戏名称map key为父游戏id，value为游戏名称
+            Map<Long, String> gameMap = getParentGameMap();
 
-            //取创建人id变成list
-            List<Long> userId = sendMsgTaskList.getRecords().stream().
-                    map(SendMsgVO::getCreateBy).collect(Collectors.toList());
+            //查询创建人id key为创建人id，value为创建人名称
+            Map<Long, String> userMap = getCreateByNameMap(sendMsgTaskList);
 
-            ResultVO<Map<Long, String>> userNameByIds = sysUserRpc.getUserNameByIds(userId);
-            Map<Long, String> userMap = userNameByIds.getData();
             //循环遍历获取游戏名称, 获取创建人名称
             sendMsgTaskList.getRecords().forEach(item -> {
                 String gameName = gameMap.get(item.getGameId());
@@ -607,13 +595,40 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
     }
 
+
+    /**
+     * 获取创建人名称
+     * @param sendMsgTaskList
+     * @return
+     */
+    private Map<Long, String> getCreateByNameMap(PageUtil<SendMsgVO> sendMsgTaskList) {
+        //取创建人id变成list
+        List<Long> userId = sendMsgTaskList.getRecords().stream().
+                map(SendMsgVO::getCreateBy).collect(Collectors.toList());
+        ResultVO<Map<Long, String>> userNameByIds = sysUserRpc.getUserNameByIds(userId);
+        return userNameByIds.getData();
+    }
+
+    /**
+     * 获取父游戏列表
+     */
+    private Map<Long, String> getParentGameMap(){
+        Sql sql = Sqls.create(getGameSql());
+        sql.setCallback(Sqls.callback.entities());
+        sql.setEntity(dao.getEntity(GameDTO.class));
+        dao.execute(sql);
+        List<GameDTO> gameDtoList = sql.getList(GameDTO.class);
+        //将游戏拼成map key为父游戏id，value为游戏名称
+        return gameDtoList.stream().collect(Collectors.toMap(GameDTO::getParentId, GameDTO::getGameName));
+    }
+
     /**
      * 查询发送消息任务结果
      * @param msgTaskResultDto msgTaskResultDto
      * @return Page<SendMsgResultVo>
      */
     @Override
-    public Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDto msgTaskResultDto) {
+    public Page<SendMsgResultVO> getSendMsgResultList(MsgTaskResultDTO msgTaskResultDto) {
         try {
             SendMsgTaskResultParam param = new SendMsgTaskResultParam();
             param.setTaskId(msgTaskResultDto.getTaskId());
@@ -636,16 +651,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //补齐参数
             Sql sql = Sqls.create(getTaskResultSql() + cri);
             sql.setCallback(Sqls.callback.entities());
-            sql.setEntity(dao.getEntity(TaskResultDto.class));
+            sql.setEntity(dao.getEntity(TaskResultDTO.class));
             dao.execute(sql);
-            List<TaskResultDto> list = sql.getList(TaskResultDto.class);
+            List<TaskResultDTO> list = sql.getList(TaskResultDTO.class);
             //拼成map key为角色id
-            HashMap<String, TaskResultDto> taskResultMap = new HashMap<>();
+            HashMap<String, TaskResultDTO> taskResultMap = new HashMap<>();
             list.forEach(item -> {
                 taskResultMap.put(item.getRoleId(), item);
             });
             sendMsgTaskResultList.getRecords().forEach(item -> {
-                TaskResultDto taskResultDto = taskResultMap.get(item.getRoleId());
+                TaskResultDTO taskResultDto = taskResultMap.get(item.getRoleId());
                 if(taskResultDto!=null){
                     item.setGameName(taskResultDto.getGameName());
                     item.setRoleName(taskResultDto.getRoleName());

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDto.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDTO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class SendMsgDto implements Serializable {
+public class SendMsgDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/rpc/ICPSendMsgRpc.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.base.rpc;
 
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskResultParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
@@ -20,7 +20,7 @@ public interface ICPSendMsgRpc {
      * @param sendMsgDto
      * @return
      */
-    ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto);
+    ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto);
 
     /**
      * 获取发送消息任务列表

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <补充客服支付判定条件 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < ( 修改类名重启´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/rpc/impl/CpSendMsgRpcImpl.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.rpc.impl;
 
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskResultParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgResultVO;
@@ -25,7 +25,7 @@ public class CpSendMsgRpcImpl implements ICPSendMsgRpc {
     private ICpSendMsgResultService cpSendMsgResultService;
 
     @Override
-    public ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto) {
+    public ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto) {
        return cpSendMsgTaskService.sendMsg(sendMsgDto);
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/ICPSendMsgTaskService.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
@@ -15,7 +15,7 @@ public interface ICPSendMsgTaskService extends IService<CpSendMsgTask> {
      * @param sendMsgDto
      * @return
      */
-    ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto);
+    ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto);
 
     /**
      * 获取消息任务列表

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CPSendMsgTaskServiceImpl.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
+import com.zanxiang.game.module.base.pojo.dto.SendMsgDTO;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVO;
 import com.zanxiang.game.module.base.util.PageUtil;
@@ -37,7 +37,7 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
     private ICpSendMsgLogService cpSendMsgLogService;
 
     @Override
-    public ResultVO<Boolean> sendMsg(SendMsgDto sendMsgDto) {
+    public ResultVO<Boolean> sendMsg(SendMsgDTO sendMsgDto) {
         try {
             //创建任务
             CpSendMsgTask cpSendMsgTask = createSendMsgTask(sendMsgDto);
@@ -76,7 +76,7 @@ public class CPSendMsgTaskServiceImpl extends ServiceImpl<CpSendMsgTaskMapper, C
                 .collect(Collectors.toList());
     }
 
-    private CpSendMsgTask createSendMsgTask(SendMsgDto dto) {
+    private CpSendMsgTask createSendMsgTask(SendMsgDTO dto) {
         CpSendMsgTask cpSendMsgTask = new CpSendMsgTask();
         cpSendMsgTask.setMsg(dto.getMsg());
         cpSendMsgTask.setRoleIdCount((long) dto.getRoles().size());

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthServiceImpl.java

@@ -81,7 +81,7 @@ public class GameAuthServiceImpl extends ServiceImpl<GameAuthMapper, GameAuth> i
                         .eq(GameAuth::getGameId, gameAuthBean.getGameId())
                         .eq(GameAuth::getUserId, userId)
                 ) > 0) {
-                    throw new BaseException("参数错误, 提交的用户存在重复权限");
+                    return;
                 }
                 addList.add(this.transform(gameAuthBean, userId));
             });