|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
|
|
|
+import com.zanxiang.game.module.mybatis.entity.Game;
|
|
|
import com.zanxiang.game.module.mybatis.entity.GameExt;
|
|
|
import com.zanxiang.game.module.mybatis.entity.User;
|
|
|
import com.zanxiang.game.module.mybatis.entity.UserCard;
|
|
@@ -16,10 +17,7 @@ import com.zanxiang.game.module.sdk.pojo.param.UpdatePasswordParam;
|
|
|
import com.zanxiang.game.module.sdk.pojo.param.UserData;
|
|
|
import com.zanxiang.game.module.sdk.pojo.vo.CustomerVO;
|
|
|
import com.zanxiang.game.module.sdk.pojo.vo.UserVO;
|
|
|
-import com.zanxiang.game.module.sdk.service.IGameExtService;
|
|
|
-import com.zanxiang.game.module.sdk.service.ISmsService;
|
|
|
-import com.zanxiang.game.module.sdk.service.IUserCardService;
|
|
|
-import com.zanxiang.game.module.sdk.service.IUserService;
|
|
|
+import com.zanxiang.game.module.sdk.service.*;
|
|
|
import com.zanxiang.game.module.sdk.util.RegisterUtil;
|
|
|
import com.zanxiang.module.util.JsonUtil;
|
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
@@ -52,6 +50,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
@Autowired
|
|
|
private IUserCardService userCardService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IGameService gameService;
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVO<Boolean> findPassword(FindPasswordParam param, UserData userData) {
|
|
@@ -190,6 +191,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
.checkSwitch(gameExt.getCheckSwitch())
|
|
|
.token(userData.getToken())
|
|
|
.build();
|
|
|
+ //判断用户是否为导量H5用户, 修正用户id
|
|
|
+ Game game = gameService.getById(user.getGameId());
|
|
|
+ if (user.getRelationUserId() != null && game.getGuideGameId() != null) {
|
|
|
+ userVO.setUserId(user.getRelationUserId());
|
|
|
+ }
|
|
|
log.error("获取用户详情返回用户信息, userVO : {}", JsonUtil.toString(userVO));
|
|
|
return userVO;
|
|
|
}
|