fix : 权限修改, 玩家列表增加筛选

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

@@ -21,7 +21,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/pojo/params/UserListParam.java

@@ -174,4 +174,22 @@ public class UserListParam extends BaseListDTO<User> {
 
     @ApiModelProperty("充值到支付的间隔时间（分）")
     private Long regPayIntervalTimeMax;
+
+    /**
+     * 是否创角
+     */
+    @ApiModelProperty(notes = "是否创角")
+    private Boolean createRole;
+
+    /**
+     * 角色数量最小值
+     */
+    @ApiModelProperty(notes = "角色数量最小值")
+    private Integer roleCountMin;
+
+    /**
+     * 角色数量最大值
+     */
+    @ApiModelProperty(notes = "角色数量最大值")
+    private Integer roleCountMax;
 }

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

@@ -3,6 +3,8 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
@@ -10,6 +12,7 @@ import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameServerAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
+import com.zanxiang.game.module.manage.service.IGameAuthService;
 import com.zanxiang.game.module.manage.service.IGameServerService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.mybatis.entity.GameServer;
@@ -21,6 +24,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import reactor.util.function.Tuple2;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -41,6 +45,9 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     @Autowired
     private IGameService gameService;
 
+    @Autowired
+    private IGameAuthService gameAuthService;
+
     @Override
     public List<String> listServerId(Long gameId, String serverName) {
         if (Strings.isBlank(serverName)) {
@@ -85,7 +92,18 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
 
     @Override
     public IPage<GameServerListVO> listOfPage(GameServerListParam param) {
+        //游戏获取
+        Tuple2<String, List<Long>> gameTuple = gameAuthService.getUserGameList(null);
+        List<Long> gameIdList = gameTuple.getT2();
+        if (CollectionUtils.isEmpty(gameIdList)) {
+            return new Page<>();
+        }
+        //不包含参数游戏
+        if (param.getGameId() != null && !gameIdList.contains(param.getGameId())) {
+            return new Page<>();
+        }
         return page(param.toPage(), new QueryWrapper<GameServer>().lambda()
+                .in(GameServer::getGameId, gameIdList)
                 .eq(param.getGameId() != null, GameServer::getGameId, param.getGameId())
                 .eq(param.getServerId() != null, GameServer::getServerId, param.getServerId())
                 .like(Strings.isNotBlank(param.getServerName()), GameServer::getServerName, param.getServerName())

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

@@ -3,12 +3,15 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameUserConfigAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameUserConfigListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserConfigListVO;
+import com.zanxiang.game.module.manage.service.IGameAuthService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.manage.service.IGameUserConfigService;
 import com.zanxiang.game.module.mybatis.entity.GameUserConfig;
@@ -19,8 +22,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import reactor.util.function.Tuple2;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -35,6 +40,9 @@ public class GameUserConfigServiceImpl extends ServiceImpl<GameUserConfigMapper,
     @Autowired
     private IGameService gameService;
 
+    @Autowired
+    private IGameAuthService gameAuthService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean addOrUpdate(GameUserConfigAddUpdateParam param) {
@@ -63,7 +71,18 @@ public class GameUserConfigServiceImpl extends ServiceImpl<GameUserConfigMapper,
 
     @Override
     public IPage<GameUserConfigListVO> listOfPage(GameUserConfigListParam param) {
+        //游戏获取
+        Tuple2<String, List<Long>> gameTuple = gameAuthService.getUserGameList(null);
+        List<Long> gameIdList = gameTuple.getT2();
+        if (CollectionUtils.isEmpty(gameIdList)) {
+            return new Page<>();
+        }
+        //不包含参数游戏
+        if (param.getGameId() != null && !gameIdList.contains(param.getGameId())) {
+            return new Page<>();
+        }
         return page(param.toPage(), new QueryWrapper<GameUserConfig>().lambda()
+                .in(GameUserConfig::getGameId, gameIdList)
                 .eq(param.getGameId() != null, GameUserConfig::getGameId, param.getGameId())
                 .orderByDesc(GameUserConfig::getCreateTime)
         ).convert(this::toVo);

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

@@ -247,7 +247,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .like(Strings.isNotBlank(param.getRoleName()), Order::getRoleName, param.getRoleName())
                 .eq(param.getCpId() != null, Order::getCpId, param.getCpId())
                 .eq(param.getGameId() != null, Order::getGameId, param.getGameId())
-                .in(Objects.equals(gameTuple.getT1(), GameAuthEnum.PITCHER.getValue()), Order::getAgentId, agentIdList)
+                .in(CollectionUtils.isNotEmpty(agentIdList), Order::getAgentId, agentIdList)
                 .eq(Strings.isNotBlank(param.getDeviceSystem()), Order::getDeviceSystem, param.getDeviceSystem())
                 .eq(param.getIsSwitch() != null, Order::getIsSwitch, param.getIsSwitch())
                 .eq(Strings.isNotBlank(param.getProductName()), Order::getProductName, param.getProductName())

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

@@ -223,9 +223,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .gt(Objects.equals(param.getIsRecharge(), Boolean.TRUE), User::getRechargeCount, 0)
                 .eq(Objects.equals(param.getIsRecharge(), Boolean.FALSE), User::getRechargeCount, 0)
                 .eq(param.getStatus() != null, User::getStatus, param.getStatus())
-                .in(Objects.equals(gameTuple.getT1(), GameAuthEnum.PITCHER.getValue()), User::getAgentId, agentIdList)
+                .in(CollectionUtils.isNotEmpty(agentIdList), User::getAgentId, agentIdList)
                 .apply(param.getRegPayIntervalTimeMin() != null, "if(last_recharge_time is not null, TIMESTAMPDIFF(minute, create_time, last_recharge_time), null) >= {0}", param.getRegPayIntervalTimeMin())
                 .apply(param.getRegPayIntervalTimeMax() != null, "if(last_recharge_time is not null, TIMESTAMPDIFF(minute, create_time, last_recharge_time), null) <= {0}", param.getRegPayIntervalTimeMax())
+                .gt(Objects.equals(param.getCreateRole(), Boolean.TRUE), User::getRoleCount, 0)
+                .le(Objects.equals(param.getCreateRole(), Boolean.FALSE), User::getRoleCount, 0)
+                .ge(param.getRoleCountMin() != null, User::getRoleCount, param.getRoleCountMin())
+                .le(param.getRoleCountMax() != null, User::getRoleCount, param.getRoleCountMax())
                 .orderByDesc(User::getCreateTime)
         ).convert(u -> this.toVo(u, gameMap, cpMap, agentDTOList));
     }