feat : 玩家模块bug修改

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

@@ -25,7 +25,7 @@ public class UserNameAuthListParam extends BasePage<UserCard> {
      * 玩家账号
      */
     @ApiModelProperty(notes = "玩家账号")
-    private String username;
+    private String userName;
 
     /**
      * 玩家昵称

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

@@ -118,9 +118,9 @@ public class UserVO {
     private String regGame;
 
     /**
-     * -1 为冻结状态, 1 为试玩状态 2为正常状态
+     * 用户状态, 0 : 为正常状态, 1 : 为冻结状态
      */
-    @ApiModelProperty(notes = "状态 , -1 为冻结, 1 为试玩 2为正常")
+    @ApiModelProperty(notes = "用户状态, 0 : 为正常状态, 1 : 为冻结状态 ")
     private Integer status;
 
     /**

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

@@ -5,7 +5,6 @@ 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.UserCardVO;
-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;
@@ -37,7 +36,7 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
     public IPage<UserCardVO> getUserCardList(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.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))
@@ -51,13 +50,16 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
      * 对象转换
      *
      * @param userCard 用户卡片
-     * @return {@link UserNameAuthVO}
+     * @return {@link UserCardVO}
      */
     private UserCardVO toVo(UserCard userCard) {
         if (Objects.isNull(userCard)) {
             return null;
         }
-        return BeanUtil.copy(userCard, UserCardVO.class);
+        UserCardVO userCardVO = BeanUtil.copy(userCard, UserCardVO.class);
+        userCardVO.setCardId(userCard.getShowCardId());
+        userCardVO.setCardName(userCard.getShowCardName());
+        return userCardVO;
     }
 
 }

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

@@ -158,6 +158,11 @@ public class User {
      */
     private String androidId;
 
+    /**
+     * 用户注册ip
+     */
+    private String ip;
+
     /**
      * 获取用户显示手机号
      *

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

@@ -91,7 +91,7 @@ public class UserCard {
         if (Strings.isBlank(this.cardId)) {
             return null;
         }
-        return this.cardId.substring(0, 6) + "********" + this.cardId.substring(this.cardId.length() - 4);
+        return this.cardId.substring(0, 3) + "***" + this.cardId.substring(this.cardId.length() - 3);
     }
 
     /**
@@ -103,6 +103,11 @@ public class UserCard {
         if (Strings.isBlank(this.cardName)) {
             return null;
         }
-        return "**" + this.cardName.substring(this.cardName.length() - 1);
+        //两个字得名字
+        if (this.cardName.length() <= 2) {
+            return this.cardName.substring(0, 1) + "*";
+        }
+        //两个字以上得名字, 显示头尾
+        return this.cardName.substring(0, 1) + "*" + this.cardName.substring(this.cardName.length() - 1);
     }
 }

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

@@ -164,6 +164,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .mac(userData.getMac())
                     .imei(userData.getImei())
                     .androidId(userData.getAndroidId())
+                    .ip(userData.getIp())
                     .build();
             userService.save(user);
             gameUserService.createGameUser(user);
@@ -212,6 +213,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .mac(userData.getMac())
                     .imei(userData.getImei())
                     .androidId(userData.getAndroidId())
+                    .ip(userData.getIp())
                     .build();
             userService.save(user);
             gameUserService.createGameUser(user);