feat : 实名认证列表查询接口修改

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/UserController.java

@@ -54,6 +54,9 @@ public class UserController {
     @Autowired
     private OrderService orderService;
 
+    @Autowired
+    private UserCardService userCardService;
+
     @ApiOperation(value = "玩家列表")
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:user:list")
@@ -155,6 +158,6 @@ public class UserController {
     @PreAuthorize(permissionKey = "sdk:userAuth:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserNameAuthVO.class)})
     public ResultVO<IPage<UserNameAuthVO>> authList(@Validated @RequestBody UserNameAuthListParam param) {
-        return ResultVO.ok(userExtService.authList(param));
+        return ResultVO.ok(userCardService.authList(param));
     }
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/UserNameAuthListParam.java

@@ -1,7 +1,7 @@
 package com.zanxiang.manage.domain.params;
 
 import com.zanxiang.common.base.BasePage;
-import com.zanxiang.mybatis.entity.UserExt;
+import com.zanxiang.mybatis.entity.UserCard;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UserNameAuthListParam extends BasePage<UserExt> {
+public class UserNameAuthListParam extends BasePage<UserCard> {
 
     /**
      * 玩家id
@@ -25,7 +25,7 @@ public class UserNameAuthListParam extends BasePage<UserExt> {
      * 玩家账号
      */
     @ApiModelProperty(notes = "玩家账号")
-    private String userName;
+    private String username;
 
     /**
      * 玩家昵称
@@ -33,12 +33,6 @@ public class UserNameAuthListParam extends BasePage<UserExt> {
     @ApiModelProperty(notes = "玩家昵称")
     private String nickname;
 
-    /**
-     * 认证平台
-     */
-    @ApiModelProperty(notes = "认证平台")
-    private Integer platformId;
-
     /**
      * 真实姓名
      */
@@ -50,10 +44,4 @@ public class UserNameAuthListParam extends BasePage<UserExt> {
      */
     @ApiModelProperty(notes = "身份证号码")
     private String idCard;
-
-    /**
-     * 中宣部PI
-     */
-    @ApiModelProperty(notes = "中宣部PI")
-    private String zxbPi;
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/UserNameAuthVO.java

@@ -37,24 +37,12 @@ public class UserNameAuthVO {
     @ApiModelProperty(notes = "注册时间")
     private LocalDateTime createTime;
 
-    /**
-     * 实名认证平台, 1 国家网络防沉迷
-     */
-    @ApiModelProperty(notes = "实名认证平台, 1 国家网络防沉迷")
-    private Integer authPlatform;
-
     /**
      * 真实姓名
      */
     @ApiModelProperty(notes = "真实姓名")
     private String realName;
 
-    /**
-     * 中宣部PI
-     */
-    @ApiModelProperty(notes = "中宣部PI")
-    private String zxbPi;
-
     /**
      * 实名认证时间
      */

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

@@ -0,0 +1,66 @@
+package com.zanxiang.manage.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.manage.domain.params.UserNameAuthListParam;
+import com.zanxiang.manage.domain.vo.UserNameAuthVO;
+import com.zanxiang.manage.service.UserCardService;
+import com.zanxiang.module.util.bean.BeanUtil;
+import com.zanxiang.mybatis.entity.UserCard;
+import com.zanxiang.mybatis.mapper.UserCardMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Objects;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-09-26
+ * @description : 用户实名认证
+ */
+@Slf4j
+@Service
+public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> implements UserCardService {
+
+    /**
+     * 获取玩家实名认证列表
+     *
+     * @param param : 查询参数
+     * @return : 返回单页数据
+     */
+    @Override
+    public IPage<UserNameAuthVO> authList(UserNameAuthListParam param) {
+        return page(param.toPage(), new QueryWrapper<UserCard>().lambda()
+                .eq(param.getUserId() != null, UserCard::getUserId, param.getUserId())
+                .eq(Strings.isNotBlank(param.getUsername()), UserCard::getUsername, param.getUsername())
+                .eq(Strings.isNotBlank(param.getNickname()), UserCard::getNickname, param.getNickname())
+                .ge(param.getBeginDate() != null, UserCard::getRegTime, param.getBeginDate() == null ? null : LocalDateTime.of(param.getBeginDate(), LocalTime.MIN))
+                .le(param.getEndDate() != null, UserCard::getRegTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
+                .eq(Strings.isNotBlank(param.getRealName()), UserCard::getCardName, param.getRealName())
+                .eq(Strings.isNotBlank(param.getIdCard()), UserCard::getCardId, param.getIdCard())
+                .orderByDesc(UserCard::getCreateTime))
+                .convert(this::toVo);
+    }
+
+
+    /**
+     * 对象转换
+     *
+     * @param userCard 用户卡片
+     * @return {@link UserNameAuthVO}
+     */
+    private UserNameAuthVO toVo(UserCard userCard) {
+        if (Objects.isNull(userCard)) {
+            return null;
+        }
+        UserNameAuthVO vo = BeanUtil.copy(userCard, UserNameAuthVO.class);
+        vo.setCreateTime(userCard.getRegTime());
+        vo.setRealName(userCard.getCardName());
+        vo.setAuthTime(userCard.getCreateTime());
+        return vo;
+    }
+}

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

@@ -1,31 +1,20 @@
 package com.zanxiang.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.service.impl.ServiceImpl;
-import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.dto.UserDTO;
 import com.zanxiang.manage.domain.dto.UserExtDTO;
-import com.zanxiang.manage.domain.params.UserNameAuthListParam;
-import com.zanxiang.manage.domain.vo.UserNameAuthVO;
 import com.zanxiang.manage.service.UserExtService;
-import com.zanxiang.manage.service.UserService;
 import com.zanxiang.mybatis.entity.UserExt;
 import com.zanxiang.mybatis.mapper.UserExtMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -38,9 +27,6 @@ import java.util.stream.Collectors;
 @Service
 public class UserExtServiceImpl extends ServiceImpl<UserExtMapper, UserExt> implements UserExtService {
 
-    @Autowired
-    private UserService userService;
-
     /**
      * 多条件查询用户拓展信息
      *
@@ -101,60 +87,4 @@ public class UserExtServiceImpl extends ServiceImpl<UserExtMapper, UserExt> impl
         }
         return BeanUtils.copy(super.getById(userId), UserExtDTO.class);
     }
-
-    /**
-     * 获取玩家实名认证列表
-     *
-     * @param param : 查询参数
-     * @return : 返回单页数据
-     */
-    @Override
-    public IPage<UserNameAuthVO> authList(UserNameAuthListParam param) {
-        Long userId = param.getUserId();
-        String userName = param.getUserName();
-        String nickname = param.getNickname();
-        //玩家账号和玩家昵称涉及的玩家条件
-        List<UserDTO> userDTOList = userService.getUserList(userId, null, userName, nickname);
-        //玩家信息map
-        Map<Long, UserDTO> map = userDTOList.stream().collect(Collectors.toMap(UserDTO::getId, Function.identity()));
-        //玩家id列表
-        List<Long> userIdList = userDTOList.stream().map(UserDTO::getId).collect(Collectors.toList());
-        //查询返回
-        return page(param.toPage(), new QueryWrapper<UserExt>().lambda()
-                .eq(UserExt::getIsAuth, Boolean.TRUE)
-                .eq(userId != null, UserExt::getUserId, userId)
-                .in(CollectionUtils.isNotEmpty(userIdList), UserExt::getUserId, userIdList)
-                .ge(param.getBeginDate() != null, UserExt::getCreateTime, param.getBeginDate() == null ? null : LocalDateTime.of(param.getBeginDate(), LocalTime.MIN))
-                .le(param.getEndDate() != null, UserExt::getCreateTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
-                .eq(param.getPlatformId() != null, UserExt::getAuthPlatform, param.getPlatformId())
-                .eq(Strings.isNotBlank(param.getRealName()), UserExt::getRealName, param.getRealName())
-                .eq(Strings.isNotBlank(param.getIdCard()), UserExt::getIdCard, param.getIdCard())
-                .eq(Strings.isNotBlank(param.getZxbPi()), UserExt::getZxbPi, param.getZxbPi())
-                .orderByDesc(UserExt::getCreateTime))
-                .convert(u -> this.toVo(u, map));
-    }
-
-    /**
-     * 玩家实名认证信息转化
-     *
-     * @param userExt : 玩家实名信息
-     * @return : 返回玩家实名信息
-     */
-    private UserNameAuthVO toVo(UserExt userExt, Map<Long, UserDTO> map) {
-        UserNameAuthVO userNameAuthVO = BeanUtils.copy(userExt, UserNameAuthVO.class);
-        if (Objects.isNull(userNameAuthVO)) {
-            return null;
-        }
-        UserDTO userDTO = StringUtils.isEmpty(map) ? null : map.get(userNameAuthVO.getUserId());
-        if (userDTO == null) {
-            userDTO = userService.getById(userNameAuthVO.getUserId());
-        }
-        if (userDTO != null) {
-            userNameAuthVO.setUsername(userDTO.getUsername());
-            userNameAuthVO.setNickname(userDTO.getNickname());
-        }
-        return userNameAuthVO;
-    }
-
-
 }

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

@@ -0,0 +1,23 @@
+package com.zanxiang.manage.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.params.UserNameAuthListParam;
+import com.zanxiang.manage.domain.vo.UserNameAuthVO;
+import com.zanxiang.mybatis.entity.UserCard;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-09-26
+ * @description : 用户实名认证
+ */
+public interface UserCardService extends IService<UserCard> {
+
+    /**
+     * 获取玩家实名认证列表
+     *
+     * @param param : 查询参数
+     * @return : 返回单页数据
+     */
+    IPage<UserNameAuthVO> authList(UserNameAuthListParam param);
+}

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

@@ -1,10 +1,7 @@
 package com.zanxiang.manage.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.dto.UserExtDTO;
-import com.zanxiang.manage.domain.params.UserNameAuthListParam;
-import com.zanxiang.manage.domain.vo.UserNameAuthVO;
 import com.zanxiang.mybatis.entity.UserExt;
 
 import java.util.Map;
@@ -41,12 +38,4 @@ public interface UserExtService extends IService<UserExt> {
      * @return : 返回玩家信息
      */
     UserExtDTO getById(Long userId);
-
-    /**
-     * 获取玩家实名认证列表
-     *
-     * @param param : 查询参数
-     * @return : 返回单页数据
-     */
-    IPage<UserNameAuthVO> authList(UserNameAuthListParam param);
 }