fix : 去除角色和玩家游戏表的渠道字段, 以用户表的渠道为准

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/UserDTO.java

@@ -26,7 +26,7 @@ public class UserDTO {
     /**
      * 最新渠道id
      */
-    private Long lastAgentId;
+    private Long agentId;
 
     /**
      * 注册游戏id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserListParam.java

@@ -75,6 +75,12 @@ public class GameUserListParam extends BaseListDTO<GameUser> {
     @ApiModelProperty(notes = "归因投放人员")
     private String pitcherId;
 
+    /**
+     * 是否充值
+     */
+    @ApiModelProperty(notes = "是否充值, true : 是, false : 否, 全部 : null或者不传")
+    private Boolean isRecharge;
+
     /**
      * 最近充值开始时间(开始玩开始时间请使用beginDate参数)
      */
@@ -87,36 +93,6 @@ public class GameUserListParam extends BaseListDTO<GameUser> {
     @ApiModelProperty(notes = "最近充值结束时间(开始玩结束时间请使用endDate参数)")
     private LocalDate rechargeEndDate;
 
-    /**
-     * 客服id
-     */
-    @ApiModelProperty(notes = "客服id")
-    private Long customerId;
-
-    /**
-     * 归因广告id
-     */
-    @ApiModelProperty(notes = "归因广告id")
-    private String adId;
-
-    /**
-     * 是否GS
-     */
-    @ApiModelProperty(notes = "是否GS")
-    private Boolean isGs;
-
-    /**
-     * 是否充值
-     */
-    @ApiModelProperty(notes = "是否充值, true : 是, false : 否, 全部 : null或者不传")
-    private Boolean isRecharge;
-
-    /**
-     * 角色vip
-     */
-    @ApiModelProperty(notes = "角色vip, 全部 : null或者不传")
-    private Integer vipLevel;
-
     /**
      * 开始时间
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/UserListVO.java

@@ -50,18 +50,6 @@ public class UserListVO {
     @ApiModelProperty(notes = "注册时间")
     private LocalDateTime createTime;
 
-    /**
-     * 注册渠道id
-     */
-    @ApiModelProperty(notes = "注册渠道id")
-    private Long regAgentId;
-
-    /**
-     * 注册渠道名称
-     */
-    @ApiModelProperty(notes = "注册渠道名称")
-    private String regAgentName;
-
     /**
      * 渠道id
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/UserVO.java

@@ -33,12 +33,6 @@ public class UserVO {
     @ApiModelProperty(notes = "密码")
     private String password;
 
-    /**
-     * 最高vip
-     */
-    @ApiModelProperty(notes = "最高vip")
-    private Integer vipMax;
-
     /**
      * 昵称
      */

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

@@ -20,14 +20,6 @@ public interface IGameUserService {
      */
     IPage<GameUserListVO> gameUserList(GameUserListParam param);
 
-    /**
-     * 获取指定用户对应vip等级最高的用户信息
-     *
-     * @param userId : 用户信息
-     * @return {@link GameUserVO}
-     */
-    GameUserVO getMaxVipGameUser(Long userId);
-
     /**
      * 获取指定用户对应vip等级最高的用户信息
      *

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

@@ -157,8 +157,8 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
             gameUserRoleListVO.setNickname(userDTO.getNickname());
             gameUserRoleListVO.setRegIp(userDTO.getIp());
             gameUserRoleListVO.setRegTime(userDTO.getCreateTime());
-            gameUserRoleListVO.setAgentId(userDTO.getLastAgentId());
-            AgentDTO agentDTO = agentMap.get(userDTO.getLastAgentId());
+            gameUserRoleListVO.setAgentId(userDTO.getAgentId());
+            AgentDTO agentDTO = agentMap.get(userDTO.getAgentId());
             gameUserRoleListVO.setAgentName(agentDTO == null ? null : agentDTO.getAgentName());
         }
         GameDTO gameDTO = CollectionUtils.isEmpty(gameMap) ? null : gameMap.get(gameUserRoleListVO.getGameId());

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

@@ -1,6 +1,5 @@
 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;
@@ -88,12 +87,8 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
                 .le(param.getEndDate() != null, GameUser::getCreateTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
                 .ge(param.getRechargeBeginDate() != null, GameUser::getLastRechargeTime, param.getRechargeBeginDate() == null ? null : LocalDateTime.of(param.getRechargeBeginDate(), LocalTime.MIN))
                 .le(param.getRechargeEndDate() != null, GameUser::getLastRechargeTime, param.getRechargeEndDate() == null ? null : LocalDateTime.of(param.getRechargeEndDate(), LocalTime.MAX))
-                .eq(param.getCustomerId() != null, GameUser::getCustomerId, param.getCustomerId())
-                .eq(param.getIsGs() != null, GameUser::getIsGs, param.getIsGs())
                 .gt(Objects.equals(param.getIsRecharge(), Boolean.TRUE), GameUser::getRechargeCount, 0)
                 .eq(Objects.equals(param.getIsRecharge(), Boolean.FALSE), GameUser::getRechargeCount, 0)
-                .eq(param.getVipLevel() != null && param.getVipLevel() <= 10, GameUser::getRoleVipMax, param.getVipLevel())
-                .gt(param.getVipLevel() != null && param.getVipLevel() > 10, GameUser::getRoleVipMax, param.getVipLevel())
                 .orderByDesc(GameUser::getCreateTime)
         ).convert(u -> this.toVo(u, userMap, gameMap, agentMap, cpMap, gameCategoryMap));
     }
@@ -111,6 +106,14 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
         if (userDTO != null) {
             gameUserListVO.setNickname(userDTO.getNickname());
             gameUserListVO.setUsername(userDTO.getUsername());
+            //用户渠道
+            AgentDTO agentDTO = agentMap.get(userDTO.getAgentId());
+            if (agentDTO != null) {
+                gameUserListVO.setAgentName(agentDTO.getAgentName());
+                gameUserListVO.setPitcherId(agentDTO.getCreateBy());
+                gameUserListVO.setPitcherName(agentDTO.getCreateByName());
+                gameUserListVO.setAccountId(agentDTO.getAccountId());
+            }
         }
         GameDTO gameDTO;
         if (CollectionUtils.isNotEmpty(gameMap) && gameMap.containsKey(gameUserListVO.getGameId())) {
@@ -125,27 +128,9 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
             gameUserListVO.setCpName(cpMap.get(gameDTO.getCpId()) == null ? null : cpMap.get(gameDTO.getCpId()).getCpName());
             gameUserListVO.setGameCategoryName(gameCategoryMap.get(gameDTO.getCategory()) == null ? null : gameCategoryMap.get(gameDTO.getCategory()).getName());
         }
-        //用户渠道
-        AgentDTO agentDTO = agentMap.get(gameUser.getAgentId());
-        //设置渠道信息
-        if (agentDTO != null) {
-            gameUserListVO.setAgentName(agentDTO.getAgentName());
-            gameUserListVO.setPitcherId(agentDTO.getCreateBy());
-            gameUserListVO.setPitcherName(agentDTO.getCreateByName());
-            gameUserListVO.setAccountId(agentDTO.getAccountId());
-        }
         return gameUserListVO;
     }
 
-    @Override
-    public GameUserVO getMaxVipGameUser(Long userId) {
-        List<GameUser> gameUserList = super.list(new LambdaQueryWrapper<GameUser>()
-                .eq(GameUser::getUserId, userId)
-                .select(GameUser::getUserId, GameUser::getRoleVipMax)
-                .orderByDesc(GameUser::getRoleVipMax));
-        return BeanUtils.copy(gameUserList.get(0), GameUserVO.class);
-    }
-
     @Override
     public GameUserVO getById(Long id) {
         return BeanUtils.copy(super.getById(id), GameUserVO.class);

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

@@ -12,7 +12,6 @@ import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.UserListParam;
 import com.zanxiang.game.module.manage.pojo.params.UserUpdateParam;
-import com.zanxiang.game.module.manage.pojo.vo.GameUserVO;
 import com.zanxiang.game.module.manage.pojo.vo.UserCardVO;
 import com.zanxiang.game.module.manage.pojo.vo.UserListVO;
 import com.zanxiang.game.module.manage.pojo.vo.UserVO;
@@ -46,9 +45,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private IGameService gameService;
 
-    @Autowired
-    private IGameUserService gameUserService;
-
     @Autowired
     private IUserService userService;
 
@@ -111,7 +107,7 @@ 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())
-                .eq(param.getChannelId() != null, User::getLastAgentId, param.getChannelId())
+                .eq(param.getChannelId() != null, User::getAgentId, param.getChannelId())
                 .orderByDesc(User::getCreateTime)
         ).convert(u -> this.toVo(u, userMap, gameMap, cpMap, gameCategoryMap, agentMap));
     }
@@ -131,16 +127,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             userListVO.setRegIp(userDTO.getIp());
             userListVO.setUsername(userDTO.getUsername());
             userListVO.setNickname(userDTO.getNickname());
-            userListVO.setRegAgentId(userDTO.getRegAgentId());
-            //注册渠道
-            AgentDTO regAgentDTO = agentMap.get(userDTO.getRegAgentId());
-
-            if (regAgentDTO != null) {
-                userListVO.setRegAgentName(regAgentDTO.getAgentName());
-            }
-            userListVO.setAgentId(userDTO.getLastAgentId());
-            //最新渠道
-            AgentDTO lastAgentDTO = agentMap.get(userDTO.getLastAgentId());
+            //渠道信息
+            userListVO.setAgentId(userDTO.getAgentId());
+            AgentDTO lastAgentDTO = agentMap.get(userDTO.getAgentId());
             if (lastAgentDTO != null) {
                 userListVO.setAgentName(lastAgentDTO.getAgentName());
                 userListVO.setAccountId(lastAgentDTO.getId());
@@ -213,16 +202,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             userVO.setRegGame(gameDTO.getName());
         }
         //渠道
-        Agent agent = agentService.getById(user.getLastAgentId());
+        Agent agent = agentService.getById(user.getAgentId());
         if (agent != null) {
             userVO.setChannelName(agent.getAgentName());
             userVO.setRegFrom(agent.getAccountType());
         }
-        //vip等级
-        GameUserVO maxVipGameUser = gameUserService.getMaxVipGameUser(userId);
-        if (maxVipGameUser != null) {
-            userVO.setVipMax(maxVipGameUser.getRoleVipMax());
-        }
         return userVO;
     }
 
@@ -236,11 +220,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         //查询
         List<User> userList = super.list(new LambdaQueryWrapper<User>()
                 .eq(userId != null, User::getId, userId)
-                .in(CollectionUtils.isNotEmpty(agentIdList), User::getLastAgentId, agentIdList)
+                .in(CollectionUtils.isNotEmpty(agentIdList), User::getAgentId, agentIdList)
                 .eq(Strings.isNotBlank(regIp), User::getIp, regIp)
                 .like(Strings.isNotBlank(userName), User::getUsername, userName)
                 .like(Strings.isNotBlank(nickname), User::getNickname, nickname)
-                .select(User::getId, User::getUsername, User::getNickname, User::getIp, User::getCreateTime, User::getLastAgentId));
+                .select(User::getId, User::getUsername, User::getNickname, User::getIp, User::getCreateTime, User::getAgentId));
         if (CollectionUtils.isEmpty(userList)) {
             return Collections.emptyMap();
         }

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameUser.java

@@ -32,16 +32,6 @@ public class GameUser {
      */
     private Long userId;
 
-    /**
-     * 所属渠道ID
-     */
-    private Long agentId;
-
-    /**
-     * 导量的渠道ID
-     */
-    private Long guidedAgentId;
-
     /**
      * 游戏ID
      */
@@ -67,31 +57,11 @@ public class GameUser {
      */
     private LocalDateTime lastRechargeTime;
 
-    /**
-     * 平台币余额
-     */
-    private BigDecimal platformCoin;
-
-    /**
-     * 是否GS
-     */
-    private Boolean isGs;
-
-    /**
-     * 客服id
-     */
-    private Long customerId;
-
     /**
      * 创角数
      */
     private Integer roleCount;
 
-    /**
-     * 拥有角色最高vip等级
-     */
-    private Integer roleVipMax;
-
     /**
      * 开始玩时间
      */

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameUserRole.java

@@ -32,11 +32,6 @@ public class GameUserRole {
      */
     private Long userId;
 
-    /**
-     * 所属渠道ID
-     */
-    private Long agentId;
-
     /**
      * 游戏用户id, 对应game_user主键id
      */
@@ -83,20 +78,15 @@ public class GameUserRole {
     private Long rolePower;
 
     /**
-     * 平台币余额
+     * 充值次数
      */
-    private BigDecimal platformCoin;
+    private Integer rechargeCount;
 
     /**
      * 充值金额
      */
     private BigDecimal rechargeMoney;
 
-    /**
-     * 充值次数
-     */
-    private Integer rechargeCount;
-
     /**
      * 最近充值时间
      */
@@ -113,14 +103,9 @@ public class GameUserRole {
     private String os;
 
     /**
-     * 游戏区服id
-     */
-    private Long regionalId;
-
-    /**
-     * 游戏区服名称
+     * 角色最后登录时间
      */
-    private String regionalName;
+    private LocalDateTime lastLoginTime;
 
     /**
      * 创建时间
@@ -132,8 +117,5 @@ public class GameUserRole {
      */
     private LocalDateTime updateTime;
 
-    /**
-     * 角色最后登录时间
-     */
-    private LocalDateTime lastLoginTime;
+
 }

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/User.java

@@ -36,7 +36,7 @@ public class User {
     /**
      * 最新渠道id
      */
-    private Long lastAgentId;
+    private Long agentId;
 
     /**
      * 注册游戏id

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IPromoChannelService.java

@@ -1,20 +0,0 @@
-package com.zanxiang.game.module.sdk.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-31
- * @description : 推广渠道
- */
-public interface IPromoChannelService extends IService<PromoChannel> {
-
-    /**
-     * 被渠道代理id
-     *
-     * @param channel 通道
-     * @return {@link Long}
-     */
-    Long getAgentIdByChannel(String channel);
-}

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameUserRoleServiceImpl.java

@@ -80,7 +80,6 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
                     .set(GameUserRole::getServerName, param.getServerName())
                     .set(param.getRoleVipLevel() != null, GameUserRole::getRoleVipLevel, param.getRoleVipLevel())
                     .set(param.getRolePower() != null, GameUserRole::getRolePower, param.getRolePower())
-                    .set(param.getPlatformCoin() != null, GameUserRole::getPlatformCoin, param.getPlatformCoin())
                     .set(GameUserRole::getUpdateTime, param.getRoleGradeUpdateTime() == null || param.getRoleGradeUpdateTime() <= 0 ? LocalDateTime.now() : DateUtil.secondToLocalDateTime(param.getRoleGradeUpdateTime()))
                     .eq(GameUserRole::getGameId, userData.getGameId())
                     .eq(GameUserRole::getRoleId, param.getRoleId()));
@@ -110,7 +109,6 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         }
         userRole = GameUserRole.builder()
                 .userId(userData.getUserId())
-                .agentId(gameUser.getAgentId())
                 .gameUserId(gameUser.getId())
                 .gameId(userData.getGameId())
                 .serverId(param.getServerId())
@@ -120,7 +118,6 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
                 .roleLevel(param.getRoleLevel())
                 .roleVipLevel(param.getRoleVipLevel())
                 .rolePower(param.getRolePower())
-                .platformCoin(param.getPlatformCoin())
                 .os(userData.getDeviceSystem())
                 .createTime(param.getRoleGradeUpdateTime() == null || param.getRoleGradeUpdateTime() <= 0 ? LocalDateTime.now() : DateUtil.secondToLocalDateTime(param.getRoleGradeUpdateTime()))
                 .updateTime(LocalDateTime.now())

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameUserServiceImpl.java

@@ -31,7 +31,6 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
         }
         super.save(GameUser.builder()
                 .userId(user.getId())
-                .agentId(user.getLastAgentId())
                 .gameId(user.getGameId())
                 .nickname(user.getNickname())
                 .createTime(LocalDateTime.now())

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -304,7 +304,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //构造用户信息
         return User.builder()
                 .regAgentId(agentId)
-                .lastAgentId(agentId)
+                .agentId(agentId)
                 .gameId(userData.getGameId())
                 .username(userName)
                 .nickname(RegisterUtil.randomNickName(userName))

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

@@ -32,9 +32,6 @@ import java.time.format.DateTimeFormatter;
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
 
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
     @Autowired
     private IGameService gameService;
 
@@ -88,7 +85,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //构造订单
         super.save(Order.builder()
                 .orderId(orderNum)
-                .agentId(promoChannelService.getAgentIdByChannel(userData.getChannel()))
+                .agentId(user.getAgentId())
                 .cpId(game.getCpId())
                 .cpOrderId(payParam.getOrderId())
                 .userId(userData.getUserId())

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PromoChannelServiceImpl.java

@@ -1,32 +0,0 @@
-package com.zanxiang.game.module.sdk.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-import com.zanxiang.game.module.mybatis.mapper.PromoChannelMapper;
-import com.zanxiang.game.module.sdk.service.IPromoChannelService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-31
- * @description : 推广渠道
- */
-@Slf4j
-@Service
-public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, PromoChannel> implements IPromoChannelService {
-
-    @Override
-    public Long getAgentIdByChannel(String channel) {
-        if (Strings.isBlank(channel)) {
-            return 0L;
-        }
-        PromoChannel promoChannel = this.getOne(new LambdaQueryWrapper<PromoChannel>().eq(PromoChannel::getChannel, channel));
-        if (promoChannel == null) {
-            return 0L;
-        }
-        return promoChannel.getId();
-    }
-}